mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't generate suffix for source-file.js

Browse source
This commit is contained in:
Guillaume Gomez 2018-12-03 22:37:34 +01:00
parent 1b432a612f
commit 82a7b6fde8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/librustdoc/html/layout.rs
View file

@ -194,10 +194,9 @@ pub fn render<T: fmt::Display, S: fmt::Display>(
.collect::<String>(), .collect::<String>(),
suffix=page.resource_suffix, suffix=page.resource_suffix,
extra_scripts=extra_scripts.iter().map(|e| { extra_scripts=extra_scripts.iter().map(|e| {
format!("<script src=\"{root_path}{extra_script}{suffix}.js\"></script>", format!("<script src=\"{root_path}{extra_script}.js\"></script>",
root_path=page.root_path, root_path=page.root_path,
extra_script=e, extra_script=e)
suffix=page.resource_suffix)
}).collect::<String>(), }).collect::<String>(),
) )
} }

3
src/librustdoc/html/render.rs
View file

@ -1375,7 +1375,8 @@ impl<'a> SourceCollector<'a> {
layout::render(&mut w, &self.scx.layout, layout::render(&mut w, &self.scx.layout,
&page, &(""), &Source(contents), &page, &(""), &Source(contents),
self.scx.css_file_extension.is_some(), self.scx.css_file_extension.is_some(),
&self.scx.themes, &["source-files", "source-script"])?; &self.scx.themes, &["source-files",
&format!("source-script{}", page.resource_suffix)])?;
w.flush()?; w.flush()?;
self.scx.local_sources.insert(p.clone(), href); self.scx.local_sources.insert(p.clone(), href);
Ok(()) Ok(())