bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Prevent generation of infinite redirections

Browse source
This commit is contained in:
Guillaume Gomez 2022-02-22 15:20:57 +01:00
parent b8967b0d52
commit a849857bda
1 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/librustdoc/html/render/context.rs
View file

@ -201,19 +201,19 @@ impl<'tcx> Context<'tcx> {
} else { } else {
tyname.as_str() tyname.as_str()
}; };
let page = layout::Page {
css_class: tyname_s,
root_path: &self.root_path(),
static_root_path: self.shared.static_root_path.as_deref(),
title: &title,
description: &desc,
keywords: &keywords,
resource_suffix: &self.shared.resource_suffix,
extra_scripts: &[],
static_extra_scripts: &[],
};
if !self.render_redirect_pages { if !self.render_redirect_pages {
let page = layout::Page {
css_class: tyname_s,
root_path: &self.root_path(),
static_root_path: self.shared.static_root_path.as_deref(),
title: &title,
description: &desc,
keywords: &keywords,
resource_suffix: &self.shared.resource_suffix,
extra_scripts: &[],
static_extra_scripts: &[],
};
layout::render( layout::render(
&self.shared.layout, &self.shared.layout,
&page, &page,
@ -223,23 +223,31 @@ impl<'tcx> Context<'tcx> {
) )
} else { } else {
if let Some(&(ref names, ty)) = self.cache().paths.get(&it.def_id.expect_def_id()) { if let Some(&(ref names, ty)) = self.cache().paths.get(&it.def_id.expect_def_id()) {
let mut path = String::new(); if self.current.len() + 1 != names.len()
for name in &names[..names.len() - 1] { || self.current.iter().zip(names.iter()).any(|(a, b)| a != b)
path.push_str(&name.as_str()); {
path.push('/'); // We checked that the redirection isn't pointing to the current file,
} // preventing an infinite redirection loop in the generated
path.push_str(&item_path(ty, &names.last().unwrap().as_str())); // documentation.
match self.shared.redirections {
Some(ref redirections) => { let mut path = String::new();
let mut current_path = String::new(); for name in &names[..names.len() - 1] {
for name in &self.current { path.push_str(&name.as_str());
current_path.push_str(&name.as_str()); path.push('/');
current_path.push('/'); }
} path.push_str(&item_path(ty, &names.last().unwrap().as_str()));
current_path.push_str(&item_path(ty, &names.last().unwrap().as_str())); match self.shared.redirections {
redirections.borrow_mut().insert(current_path, path); Some(ref redirections) => {
let mut current_path = String::new();
for name in &self.current {
current_path.push_str(&name.as_str());
current_path.push('/');
}
current_path.push_str(&item_path(ty, &names.last().unwrap().as_str()));
redirections.borrow_mut().insert(current_path, path);
}
None => return layout::redirect(&format!("{}{}", self.root_path(), path)),
} }
None => return layout::redirect(&format!("{}{}", self.root_path(), path)),
} }
} }
String::new() String::new()