bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #59776 - GuillaumeGomez:apply-resource-suffix, r=QuietMisdreavus

Browse source 
Apply resource-suffix to search-index and source-files scripts as well

Fixes #59771.

r? @QuietMisdreavus
This commit is contained in:
Mazdak Farrokhzad 2019-04-14 00:39:41 +02:00 • committed by GitHub
commit ae0bf84a14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1013,7 +1013,7 @@ themePicker.onblur = handleThemeButtonsBlur;
})
}
let dst = cx.dst.join("aliases.js");
let dst = cx.dst.join(&format!("aliases{}.js", cx.shared.resource_suffix));
{
let (mut all_aliases, _, _) = try_err!(collect(&dst, &krate.name, "ALIASES", false), &dst);
let mut w = try_err!(File::create(&dst), &dst);
@ -1099,7 +1099,7 @@ themePicker.onblur = handleThemeButtonsBlur;
}
}
let dst = cx.dst.join("source-files.js");
let dst = cx.dst.join(&format!("source-files{}.js", cx.shared.resource_suffix));
let (mut all_sources, _krates, _) = try_err!(collect(&dst, &krate.name, "sourcesIndex",
false),
&dst);
@ -1115,7 +1115,7 @@ themePicker.onblur = handleThemeButtonsBlur;
}
// Update the search index
let dst = cx.dst.join("search-index.js");
let dst = cx.dst.join(&format!("search-index{}.js", cx.shared.resource_suffix));
let (mut all_indexes, mut krates, variables) = try_err!(collect(&dst,
&krate.name,
"searchIndex",
@ -1483,7 +1483,7 @@ impl<'a> SourceCollector<'a> {
description: &desc,
keywords: BASIC_KEYWORDS,
resource_suffix: &self.scx.resource_suffix,
extra_scripts: &["source-files"],
extra_scripts: &[&format!("source-files{}", self.scx.resource_suffix)],
static_extra_scripts: &[&format!("source-script{}", self.scx.resource_suffix)],
};
layout::render(&mut w, &self.scx.layout,