diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-12-03 22:37:34 +0100 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-12-03 22:37:34 +0100 |
| commit | 82a7b6fde819e7e402ea9be6af14fe2c1575950e (patch) | |
| tree | f435a945e0913045c60c6102d247e799dac5d10b /src | |
| parent | 1b432a612f24581717dc9d5f2f13873d187bb5bd (diff) | |
| download | rust-82a7b6fde819e7e402ea9be6af14fe2c1575950e.tar.gz rust-82a7b6fde819e7e402ea9be6af14fe2c1575950e.zip | |
Don't generate suffix for source-file.js
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/layout.rs | 5 | ||||
| -rw-r--r-- | 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 287e5a31888..5263cfe7b0e 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -194,10 +194,9 @@ pub fn render<T: fmt::Display, S: fmt::Display>( .collect::<String>(), suffix=page.resource_suffix, 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, - extra_script=e, - suffix=page.resource_suffix) + extra_script=e) }).collect::<String>(), ) } diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 7b020415af1..ae3f57ab85e 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(()) |