Skip to content

Commit 6a6e203

Browse files
πŸ”– bump version 6.0.1 -> 6.0.2 (#415)
1 parent 10a050a commit 6a6e203

10 files changed

Lines changed: 31 additions & 18 deletions

File tree

β€ŽCHANGELOG.mdβ€Ž

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ and this project attempts to adhere to [Semantic Versioning](https://semver.org/
1818

1919
## [Unreleased]
2020

21+
## [6.0.2]
22+
23+
### Changed
24+
25+
- Bumped TagSpecs v0.4.0 deprecation removal target from v6.0.2 to v6.0.3.
26+
2127
### Fixed
2228

2329
- Fixed `djls check` with no arguments silently reading stdin instead of discovering template files. Stdin is now triggered explicitly by passing `-` as a path.
@@ -227,7 +233,7 @@ and this project attempts to adhere to [Semantic Versioning](https://semver.org/
227233

228234
- Josh Thomas <josh@joshthomas.dev> (maintainer)
229235

230-
[unreleased]: https://github.com/joshuadavidthomas/django-language-server/compare/v6.0.1...HEAD
236+
[unreleased]: https://github.com/joshuadavidthomas/django-language-server/compare/v6.0.2...HEAD
231237
[5.1.0a0]: https://github.com/joshuadavidthomas/django-language-server/releases/tag/v5.1.0a0
232238
[5.1.0a1]: https://github.com/joshuadavidthomas/django-language-server/releases/tag/v5.1.0a1
233239
[5.1.0a2]: https://github.com/joshuadavidthomas/django-language-server/releases/tag/v5.1.0a2
@@ -239,3 +245,4 @@ and this project attempts to adhere to [Semantic Versioning](https://semver.org/
239245
[5.2.4]: https://github.com/joshuadavidthomas/django-language-server/releases/tag/v5.2.4
240246
[6.0.0]: https://github.com/joshuadavidthomas/django-language-server/releases/tag/v6.0.0
241247
[6.0.1]: https://github.com/joshuadavidthomas/django-language-server/releases/tag/v6.0.1
248+
[6.0.2]: https://github.com/joshuadavidthomas/django-language-server/releases/tag/v6.0.2

β€ŽCargo.lockβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcrates/djls-bench/benches/diagnostics.rsβ€Ž

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ fn collect_diagnostics_minimal(bencher: Bencher, fixture: &TemplateFixture) {
106106
if let Some(nl) = nodelist {
107107
djls_semantic::validate_nodelist(&db, nl);
108108
}
109+
let _ = djls_ide::collect_diagnostics(&db, file, nodelist);
109110

110111
bencher.bench_local(move || {
111112
let nodelist = djls_templates::parse_template(&db, file);
@@ -120,10 +121,15 @@ fn collect_diagnostics_realistic(bencher: Bencher, fixture: &TemplateFixture) {
120121
let mut db = realistic_db();
121122
let file = db.file_with_contents(fixture.path.clone(), &fixture.source);
122123

124+
// Warm up: parse, validate, AND collect diagnostics so all Salsa memos
125+
// and allocator patterns are primed before measurement. Without this,
126+
// the accumulator-read path and diagnostic conversion allocations can
127+
// produce bimodal instruction counts under valgrind (CodSpeed).
123128
let nodelist = djls_templates::parse_template(&db, file);
124129
if let Some(nl) = nodelist {
125130
djls_semantic::validate_nodelist(&db, nl);
126131
}
132+
let _ = djls_ide::collect_diagnostics(&db, file, nodelist);
127133

128134
bencher.bench_local(move || {
129135
let nodelist = djls_templates::parse_template(&db, file);

β€Žcrates/djls-conf/src/lib.rsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ where
9494
if let Ok(legacy) = Vec::<tagspecs::legacy::LegacyTagSpecDef>::deserialize(&value) {
9595
tracing::warn!(concat!(
9696
"DEPRECATED: TagSpecs v0.4.0 format detected. Please migrate to v0.6.0 format. ",
97-
"The old format will be removed in v6.0.2. ",
97+
"The old format will be removed in v6.0.3. ",
9898
"See migration guide: https://djls.joshthomas.dev/configuration/tagspecs/#migration-from-v040",
9999
));
100100
#[allow(deprecated)]

β€Žcrates/djls-conf/src/tagspecs.rsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::collections::HashMap;
22

33
use serde::Deserialize;
44

5-
// Legacy v0.4.0 format support (converted to v0.6.0). Removed in v6.0.2.
5+
// Legacy v0.4.0 format support (converted to v0.6.0). Removed in v6.0.3.
66
pub mod legacy;
77

88
/// Root `TagSpec` document (v0.6.0)

β€Žcrates/djls-conf/src/tagspecs/legacy.rsβ€Ž

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// DEPRECATION: This entire module will be removed in v6.0.2
1+
// DEPRECATION: This entire module will be removed in v6.0.3
22
// Legacy v0.4.0 TagSpec format support
33
//
44
// This module provides backward compatibility for the old flat tagspec format.
5-
// Deprecated in v6.0.0; removed in v6.0.2.
5+
// Deprecated in v6.0.0; removed in v6.0.3.
66

77
use std::collections::HashMap;
88

@@ -18,7 +18,7 @@ use super::TagSpecDef;
1818
use super::TagTypeDef;
1919

2020
/// Legacy v0.4.0 tag specification
21-
#[deprecated(since = "6.0.0", note = "Remove in v6.0.2")]
21+
#[deprecated(since = "6.0.0", note = "Remove in v6.0.3")]
2222
#[allow(deprecated)]
2323
#[derive(Debug, Clone, Deserialize, PartialEq)]
2424
pub struct LegacyTagSpecDef {
@@ -38,7 +38,7 @@ pub struct LegacyTagSpecDef {
3838
}
3939

4040
/// Legacy end tag specification
41-
#[deprecated(since = "6.0.0", note = "Remove in v6.0.2")]
41+
#[deprecated(since = "6.0.0", note = "Remove in v6.0.3")]
4242
#[allow(deprecated)]
4343
#[derive(Debug, Clone, Deserialize, PartialEq)]
4444
pub struct LegacyEndTagDef {
@@ -53,7 +53,7 @@ pub struct LegacyEndTagDef {
5353
}
5454

5555
/// Legacy intermediate tag specification
56-
#[deprecated(since = "6.0.0", note = "Remove in v6.0.2")]
56+
#[deprecated(since = "6.0.0", note = "Remove in v6.0.3")]
5757
#[allow(deprecated)]
5858
#[derive(Debug, Clone, Deserialize, PartialEq)]
5959
pub struct LegacyIntermediateTagDef {
@@ -65,7 +65,7 @@ pub struct LegacyIntermediateTagDef {
6565
}
6666

6767
/// Legacy tag argument specification
68-
#[deprecated(since = "6.0.0", note = "Remove in v6.0.2")]
68+
#[deprecated(since = "6.0.0", note = "Remove in v6.0.3")]
6969
#[allow(deprecated)]
7070
#[derive(Debug, Clone, Deserialize, PartialEq)]
7171
pub struct LegacyTagArgDef {
@@ -80,7 +80,7 @@ pub struct LegacyTagArgDef {
8080
}
8181

8282
/// Legacy argument type specification
83-
#[deprecated(since = "6.0.0", note = "Remove in v6.0.2")]
83+
#[deprecated(since = "6.0.0", note = "Remove in v6.0.3")]
8484
#[allow(deprecated)]
8585
#[derive(Debug, Clone, Deserialize, PartialEq)]
8686
#[serde(untagged)]
@@ -92,7 +92,7 @@ pub enum LegacyArgTypeDef {
9292
}
9393

9494
/// Legacy simple argument types
95-
#[deprecated(since = "6.0.0", note = "Remove in v6.0.2")]
95+
#[deprecated(since = "6.0.0", note = "Remove in v6.0.3")]
9696
#[allow(deprecated)]
9797
#[derive(Debug, Clone, Deserialize, PartialEq)]
9898
#[serde(rename_all = "lowercase")]
@@ -112,7 +112,7 @@ fn default_true() -> bool {
112112
/// Convert a vector of legacy tagspecs to the new v0.6.0 hierarchical format.
113113
///
114114
/// Groups tags by module and creates the appropriate library structure.
115-
#[deprecated(since = "6.0.0", note = "Remove in v6.0.2")]
115+
#[deprecated(since = "6.0.0", note = "Remove in v6.0.3")]
116116
#[must_use]
117117
pub fn convert_legacy_tagspecs(legacy: Vec<LegacyTagSpecDef>) -> TagSpecDef {
118118
let mut modules: HashMap<String, Vec<TagDef>> = HashMap::new();

β€Žcrates/djls/Cargo.tomlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "djls"
3-
version = "6.0.1"
3+
version = "6.0.2"
44
edition = "2021"
55

66
[dependencies]

β€Ždocs/configuration/tagspecs.mdβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ TagSpecs can be configured in your project's `djls.toml`, `.djls.toml`, or `pypr
8585
The legacy v0.4.0 flat TagSpecs format is still supported for compatibility, but is deprecated.
8686

8787
- **v6.0.0**: legacy format deprecated (warnings)
88-
- **v6.0.2**: legacy format removed
88+
- **v6.0.3**: legacy format removed
8989

9090
If you are still using the legacy format, migrate to v0.6.0.

β€Žpyproject.tomlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ docs = [
1717

1818
[project]
1919
name = "django-language-server"
20-
version = "6.0.1"
20+
version = "6.0.2"
2121
description = "A language server for the Django web framework"
2222
readme = "README.md"
2323
authors = [
@@ -87,7 +87,7 @@ Source = "https://github.com/joshuadavidthomas/django-language-server"
8787
[tool.bumpver]
8888
commit = true
8989
commit_message = ":bookmark: bump version {old_version} -> {new_version}"
90-
current_version = "6.0.1"
90+
current_version = "6.0.2"
9191
push = true
9292
tag = false
9393
version_pattern = "MAJOR.MINOR.PATCH[-TAG[.NUM]]"

β€Žuv.lockβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)