From 82a7b6fde819e7e402ea9be6af14fe2c1575950e Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Mon, 3 Dec 2018 22:37:34 +0100 Subject: [PATCH] Don't generate suffix for source-file.js --- src/librustdoc/html/layout.rs | 5 ++--- src/librustdoc/html/render.rs | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index 287e5a31888c..5263cfe7b0e4 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -194,10 +194,9 @@ pub fn render( .collect::(), suffix=page.resource_suffix, extra_scripts=extra_scripts.iter().map(|e| { - format!("", + format!("", root_path=page.root_path, - extra_script=e, - suffix=page.resource_suffix) + extra_script=e) }).collect::(), ) } diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 7b020415af1b..ae3f57ab85eb 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1375,7 +1375,8 @@ impl<'a> SourceCollector<'a> { layout::render(&mut w, &self.scx.layout, &page, &(""), &Source(contents), 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()?; self.scx.local_sources.insert(p.clone(), href); Ok(())