OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #59158 - Manishearth:fix-minification, r=GuillaumeGomez

Browse Source 
Revert "Don't generate minification variable if minification disabled"

Reverts #58643

Fixes #59157

https://github.com/rust-lang/rust/pull/58643 made us stop generating minification variables when minification is disabled, however they may still be needed for parent crates that were generated with minification (this will always be the case for libstd and libcore)

r? @QuietMisdreavus @GuillaumeGomez
This commit is contained in:
kennytm 2019-03-16 14:56:53 +08:00
commit 25e4366b4c
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustdoc/html/render.rs
View File

@ -1117,11 +1117,7 @@ themePicker.onblur = handleThemeButtonsBlur;
// with rustdoc running in parallel. // with rustdoc running in parallel.
all_indexes.sort(); all_indexes.sort();
let mut w = try_err!(File::create(&dst), &dst); let mut w = try_err!(File::create(&dst), &dst);
if options.enable_minification { try_err!(writeln!(&mut w, "var N=null,E=\"\",T=\"t\",U=\"u\",searchIndex={{}};"), &dst);
try_err!(writeln!(&mut w, "var N=null,E=\"\",T=\"t\",U=\"u\",searchIndex={{}};"), &dst);
} else {
try_err!(writeln!(&mut w, "var searchIndex={{}};"), &dst);
}
try_err!(write_minify_replacer(&mut w, try_err!(write_minify_replacer(&mut w,
&format!("{}\n{}", variables.join(""), all_indexes.join("\n")), &format!("{}\n{}", variables.join(""), all_indexes.join("\n")),
options.enable_minification), options.enable_minification),