Skip to content

Commit 0846035

Browse files
Rollup merge of #141487 - GuillaumeGomez:update-askama, r=notriddle
Update askama to `0.14.0` [Askama 0.14.0 release notes](https://github.com/askama-rs/askama/releases/tag/v0.14.0) Just one change needed for a filter in rustdoc. r? ```@notriddle```
2 parents 284aaee + a643892 commit 0846035

File tree

6 files changed

+57
-15
lines changed

6 files changed

+57
-15
lines changed

Cargo.lock

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,20 @@ version = "0.13.1"
183183
source = "registry+https://github.com/rust-lang/crates.io-index"
184184
checksum = "5d4744ed2eef2645831b441d8f5459689ade2ab27c854488fbab1fbe94fce1a7"
185185
dependencies = [
186-
"askama_derive",
186+
"askama_derive 0.13.1",
187+
"itoa",
188+
"percent-encoding",
189+
"serde",
190+
"serde_json",
191+
]
192+
193+
[[package]]
194+
name = "askama"
195+
version = "0.14.0"
196+
source = "registry+https://github.com/rust-lang/crates.io-index"
197+
checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
198+
dependencies = [
199+
"askama_derive 0.14.0",
187200
"itoa",
188201
"percent-encoding",
189202
"serde",
@@ -196,7 +209,24 @@ version = "0.13.1"
196209
source = "registry+https://github.com/rust-lang/crates.io-index"
197210
checksum = "d661e0f57be36a5c14c48f78d09011e67e0cb618f269cca9f2fd8d15b68c46ac"
198211
dependencies = [
199-
"askama_parser",
212+
"askama_parser 0.13.0",
213+
"basic-toml",
214+
"memchr",
215+
"proc-macro2",
216+
"quote",
217+
"rustc-hash 2.1.1",
218+
"serde",
219+
"serde_derive",
220+
"syn 2.0.101",
221+
]
222+
223+
[[package]]
224+
name = "askama_derive"
225+
version = "0.14.0"
226+
source = "registry+https://github.com/rust-lang/crates.io-index"
227+
checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
228+
dependencies = [
229+
"askama_parser 0.14.0",
200230
"basic-toml",
201231
"memchr",
202232
"proc-macro2",
@@ -219,6 +249,18 @@ dependencies = [
219249
"winnow 0.7.10",
220250
]
221251

252+
[[package]]
253+
name = "askama_parser"
254+
version = "0.14.0"
255+
source = "registry+https://github.com/rust-lang/crates.io-index"
256+
checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
257+
dependencies = [
258+
"memchr",
259+
"serde",
260+
"serde_derive",
261+
"winnow 0.7.10",
262+
]
263+
222264
[[package]]
223265
name = "autocfg"
224266
version = "1.4.0"
@@ -540,7 +582,7 @@ name = "clippy"
540582
version = "0.1.89"
541583
dependencies = [
542584
"anstream",
543-
"askama",
585+
"askama 0.13.1",
544586
"cargo_metadata 0.18.1",
545587
"clippy_config",
546588
"clippy_lints",
@@ -1389,7 +1431,7 @@ name = "generate-copyright"
13891431
version = "0.1.0"
13901432
dependencies = [
13911433
"anyhow",
1392-
"askama",
1434+
"askama 0.14.0",
13931435
"cargo_metadata 0.18.1",
13941436
"serde",
13951437
"serde_json",
@@ -4622,7 +4664,7 @@ name = "rustdoc"
46224664
version = "0.0.0"
46234665
dependencies = [
46244666
"arrayvec",
4625-
"askama",
4667+
"askama 0.14.0",
46264668
"base64",
46274669
"expect-test",
46284670
"indexmap",

src/ci/citool/Cargo.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
6666

6767
[[package]]
6868
name = "askama"
69-
version = "0.13.1"
69+
version = "0.14.0"
7070
source = "registry+https://github.com/rust-lang/crates.io-index"
71-
checksum = "5d4744ed2eef2645831b441d8f5459689ade2ab27c854488fbab1fbe94fce1a7"
71+
checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
7272
dependencies = [
7373
"askama_derive",
7474
"itoa",
@@ -79,9 +79,9 @@ dependencies = [
7979

8080
[[package]]
8181
name = "askama_derive"
82-
version = "0.13.1"
82+
version = "0.14.0"
8383
source = "registry+https://github.com/rust-lang/crates.io-index"
84-
checksum = "d661e0f57be36a5c14c48f78d09011e67e0cb618f269cca9f2fd8d15b68c46ac"
84+
checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
8585
dependencies = [
8686
"askama_parser",
8787
"basic-toml",
@@ -96,9 +96,9 @@ dependencies = [
9696

9797
[[package]]
9898
name = "askama_parser"
99-
version = "0.13.0"
99+
version = "0.14.0"
100100
source = "registry+https://github.com/rust-lang/crates.io-index"
101-
checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
101+
checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
102102
dependencies = [
103103
"memchr",
104104
"serde",

src/ci/citool/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
anyhow = "1"
8-
askama = "0.13"
8+
askama = "0.14"
99
clap = { version = "4.5", features = ["derive"] }
1010
csv = "1"
1111
diff = "0.1"

src/librustdoc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ path = "lib.rs"
99

1010
[dependencies]
1111
arrayvec = { version = "0.7", default-features = false }
12-
askama = { version = "0.13", default-features = false, features = ["alloc", "config", "derive"] }
12+
askama = { version = "0.14", default-features = false, features = ["alloc", "config", "derive"] }
1313
base64 = "0.21.7"
1414
itertools = "0.12"
1515
indexmap = "2"

src/librustdoc/html/render/sidebar.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ pub(crate) mod filters {
127127
use askama::filters::Safe;
128128

129129
use crate::html::escape::EscapeBodyTextWithWbr;
130-
pub(crate) fn wrapped<T>(v: T) -> askama::Result<Safe<impl Display>>
130+
pub(crate) fn wrapped<T, V: askama::Values>(v: T, _: V) -> askama::Result<Safe<impl Display>>
131131
where
132132
T: Display,
133133
{

src/tools/generate-copyright/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "Produces a manifest of all the copyrighted materials in the Rust
88

99
[dependencies]
1010
anyhow = "1.0.65"
11-
askama = "0.13.0"
11+
askama = "0.14.0"
1212
cargo_metadata = "0.18.1"
1313
serde = { version = "1.0.147", features = ["derive"] }
1414
serde_json = "1.0.85"

0 commit comments

Comments
 (0)