Remove rest_menu_url filter

rust-lang · Sep 21, 2024 · 0620ea4 · 0620ea4
1 parent ada6f3a
commit 0620ea4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/web/page/templates.rs b/src/web/page/templates.rs
@@ -239,13 +239,6 @@ pub mod filters {
             serde_json::to_string(value).expect("`encode_json` failed"),
         ))
     }
-
-    pub fn rest_menu_url(current_target: &str, inner_path: &str) -> rinja::Result<String> {
-        if current_target.is_empty() {
-            return Ok(String::new());
-        }
-        Ok(format!("/{current_target}/{inner_path}"))
-    }
 }
 
 enum IconType {

diff --git a/templates/rustdoc/topbar.html b/templates/rustdoc/topbar.html
@@ -4,10 +4,10 @@
 {%- include "header/topbar_begin.html" -%}
 {%- set crate_url = "/crate/{}/{}"|format(metadata.name, metadata.req_version) -%}
 {%- set rest_menu_url -%}
-{%- if current_target is defined -%}
-    {%- set rest_menu_url = current_target|rest_menu_url(inner_path) -%}
+{%- if current_target is defined && !current_target.is_empty() -%}
+    {%- set rest_menu_url = format!("/{}/{}", self.current_target, self.inner_path) -%}
 {%- else -%}
-    {%- set rest_menu_url = ""|rest_menu_url(inner_path) -%}
+    {%- set rest_menu_url = String::new() -%}
 {%- endif -%}
 {%- set platform_menu_url = "{}/menus/platforms{}"|format(crate_url, rest_menu_url) -%}
 {%- set releases_menu_url = "{}/menus/releases{}"|format(crate_url, rest_menu_url) -%}