diff --git a/Cargo.lock b/Cargo.lock index 4b3eb0b31..f76df32ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5317,9 +5317,9 @@ dependencies = [ [[package]] name = "rinja" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a73141aab0b35b30bb993f5c832b8c9211709563b8b95517713b7d00ebb063e" +checksum = "f28580fecce391f3c0e65a692e5f2b5db258ba2346ee04f355ae56473ab973dc" dependencies = [ "humansize", "itoa 1.0.11", @@ -5330,9 +5330,9 @@ dependencies = [ [[package]] name = "rinja_derive" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b0baa0b963e94a919d0dcad5be1e2d30dcc0fdab93d9803ab4a019e188647c" +checksum = "1f1ae91455a4c82892d9513fcfa1ac8faff6c523602d0041536341882714aede" dependencies = [ "basic-toml", "memchr", @@ -5349,9 +5349,9 @@ dependencies = [ [[package]] name = "rinja_parser" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27303ef1ee98bb4240e3dd417f26459061e068d331b7ad05576167da3ae59a4e" +checksum = "06ea17639e1f35032e1c67539856e498c04cd65fe2a45f55ec437ec55e4be941" dependencies = [ "memchr", "nom", diff --git a/Cargo.toml b/Cargo.toml index 3b52288b9..bd3a550cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,7 +100,7 @@ tempfile = "3.1.0" fn-error-context = "0.2.0" # Templating -rinja = "0.3.3" +rinja = "0.3.4" walkdir = "2" # Date and Time utilities diff --git a/src/web/page/templates.rs b/src/web/page/templates.rs index 7d3cffbd0..f3af85c7d 100644 --- 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 { - 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 index b00e2fbe9..dae2b44e0 100644 --- 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) -%}