Skip to content

Commit 5289486

Browse files
authored
Unrolled build for rust-lang#120288
Rollup merge of rust-lang#120288 - clubby789:bump-askama, r=GuillaumeGomez Bump `askama` version Ran into this while looking at rust-lang#112865 and thought it would be useful to fix it now. Some more details in [Zulip](https://rust-lang.zulipchat.com/#narrow/stream/266220-t-rustdoc/topic/Askama.20parser.20changes)
2 parents 5bd5d21 + da33619 commit 5289486

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

Cargo.lock

+14-5
Original file line numberDiff line numberDiff line change
@@ -212,24 +212,24 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
212212

213213
[[package]]
214214
name = "askama"
215-
version = "0.12.0"
215+
version = "0.12.1"
216216
source = "registry+https://github.com/rust-lang/crates.io-index"
217-
checksum = "47cbc3cf73fa8d9833727bbee4835ba5c421a0d65b72daf9a7b5d0e0f9cfb57e"
217+
checksum = "b79091df18a97caea757e28cd2d5fda49c6cd4bd01ddffd7ff01ace0c0ad2c28"
218218
dependencies = [
219219
"askama_derive",
220220
"askama_escape",
221221
]
222222

223223
[[package]]
224224
name = "askama_derive"
225-
version = "0.12.1"
225+
version = "0.12.5"
226226
source = "registry+https://github.com/rust-lang/crates.io-index"
227-
checksum = "c22fbe0413545c098358e56966ff22cdd039e10215ae213cfbd65032b119fc94"
227+
checksum = "19fe8d6cb13c4714962c072ea496f3392015f0989b1a2847bb4b2d9effd71d83"
228228
dependencies = [
229+
"askama_parser",
229230
"basic-toml",
230231
"mime",
231232
"mime_guess",
232-
"nom",
233233
"proc-macro2",
234234
"quote",
235235
"serde",
@@ -242,6 +242,15 @@ version = "0.10.3"
242242
source = "registry+https://github.com/rust-lang/crates.io-index"
243243
checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
244244

245+
[[package]]
246+
name = "askama_parser"
247+
version = "0.2.1"
248+
source = "registry+https://github.com/rust-lang/crates.io-index"
249+
checksum = "acb1161c6b64d1c3d83108213c2a2533a342ac225aabd0bda218278c2ddb00c0"
250+
dependencies = [
251+
"nom",
252+
]
253+
245254
[[package]]
246255
name = "autocfg"
247256
version = "1.1.0"
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<pre class="rust item-decl"><code>
2-
{{ self.render_attributes_in_pre() | safe }}
3-
{{ self.render_union() | safe }}
2+
{{ self.render_attributes_in_pre()|safe }}
3+
{{ self.render_union()|safe }}
44
</code></pre>
5-
{{ self.document() | safe }}
5+
{{ self.document()|safe }}
66
{% if self.fields_iter().peek().is_some() %}
77
<h2 id="fields" class="fields section-header"> {# #}
88
Fields<a href="#fields" class="anchor">§</a> {# #}
@@ -12,13 +12,13 @@ <h2 id="fields" class="fields section-header"> {# #}
1212
<span id="structfield.{{ name }}" {#+ #}
1313
class="{{ ItemType::StructField +}} section-header"> {# #}
1414
<a href="#structfield.{{ name }}" class="anchor field">§</a> {# #}
15-
<code>{{ name }}: {{+ self.print_ty(ty) | safe }}</code> {# #}
15+
<code>{{ name }}: {{+ self.print_ty(ty)|safe }}</code> {# #}
1616
</span>
1717
{% if let Some(stability_class) = self.stability_field(field) %}
1818
<span class="stab {{ stability_class }}"></span>
1919
{% endif %}
20-
{{ self.document_field(field) | safe }}
20+
{{ self.document_field(field)|safe }}
2121
{% endfor %}
2222
{% endif %}
23-
{{ self.render_assoc_items() | safe }}
24-
{{ self.document_type_layout() | safe }}
23+
{{ self.render_assoc_items()|safe }}
24+
{{ self.document_type_layout()|safe }}

0 commit comments

Comments
 (0)