Auto merge of #59950 - Centril:rollup-hpmr62i, r=Centril
Rollup of 6 pull requests Successful merges: - #59776 (Apply resource-suffix to search-index and source-files scripts as well) - #59784 (Suggest importing macros from the crate root) - #59812 (Exclude profiler-generated symbols from MSVC __imp_-symbol workaround.) - #59874 (Clean up handling of `-Z pgo-gen` commandline option.) - #59890 (Don't generate empty json variables) - #59911 (Revert "compile crates under test w/ -Zemit-stack-sizes") Failed merges: r? @ghost
This commit is contained in:
commit
ee621f4232
22 changed files with 880 additions and 198 deletions
|
@ -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);
|
||||
|
@ -1064,11 +1064,22 @@ themePicker.onblur = handleThemeButtonsBlur;
|
|||
.expect("invalid osstring conversion")))
|
||||
.collect::<Vec<_>>();
|
||||
files.sort_unstable_by(|a, b| a.cmp(b));
|
||||
// FIXME(imperio): we could avoid to generate "dirs" and "files" if they're empty.
|
||||
format!("{{\"name\":\"{name}\",\"dirs\":[{subs}],\"files\":[{files}]}}",
|
||||
let subs = subs.iter().map(|s| s.to_json_string()).collect::<Vec<_>>().join(",");
|
||||
let dirs = if subs.is_empty() {
|
||||
String::new()
|
||||
} else {
|
||||
format!(",\"dirs\":[{}]", subs)
|
||||
};
|
||||
let files = files.join(",");
|
||||
let files = if files.is_empty() {
|
||||
String::new()
|
||||
} else {
|
||||
format!(",\"files\":[{}]", files)
|
||||
};
|
||||
format!("{{\"name\":\"{name}\"{dirs}{files}}}",
|
||||
name=self.elem.to_str().expect("invalid osstring conversion"),
|
||||
subs=subs.iter().map(|s| s.to_json_string()).collect::<Vec<_>>().join(","),
|
||||
files=files.join(","))
|
||||
dirs=dirs,
|
||||
files=files)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1099,7 +1110,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 +1126,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 +1494,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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue