Skip to content

Remove rest_menu_url filter #2609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 21, 2024
Merged

Remove rest_menu_url filter #2609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1f700b
Update `rinja` version to `0.3.4`
GuillaumeGomez Sep 19, 2024
d5d905e
Remove `rest_menu_url` filter
GuillaumeGomez Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions src/web/page/templates.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions templates/rustdoc/topbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) -%}
Expand Down
Loading