Make json_encode filter "safe"

rust-lang · Sep 19, 2024 · 2c30204 · 2c30204
1 parent be4f185
commit 2c30204
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/web/page/templates.rs b/src/web/page/templates.rs
@@ -234,8 +234,10 @@ pub mod filters {
         Ok(value.split(pat).next())
     }
 
-    pub fn json_encode<T: ?Sized + serde::Serialize>(value: &T) -> rinja::Result<String> {
-        Ok(serde_json::to_string(value).expect("`encode_json` failed"))
+    pub fn json_encode<T: ?Sized + serde::Serialize>(value: &T) -> rinja::Result<Safe<String>> {
+        Ok(Safe(
+            serde_json::to_string(value).expect("`encode_json` failed"),
+        ))
     }
 
     pub fn rest_menu_url(current_target: &str, inner_path: &str) -> rinja::Result<String> {

diff --git a/templates/rustdoc/topbar.html b/templates/rustdoc/topbar.html
@@ -16,8 +16,8 @@
         {# the only text that needs escaping in a <script> is `</`, none of the
             values below can include that sequence #}
         {
-            "name": {{ metadata.name|json_encode|safe }},
-            "version": {{ metadata.version|json_encode|safe }}
+            "name": {{ metadata.name|json_encode }},
+            "version": {{ metadata.version|json_encode }}
         }
     </script>
     {%- if krate is defined -%}