Skip to content

Commit 25e4366

Browse files
committed
Rollup merge of rust-lang#59158 - Manishearth:fix-minification, r=GuillaumeGomez
Revert "Don't generate minification variable if minification disabled" Reverts rust-lang#58643 Fixes rust-lang#59157 rust-lang#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
2 parents ce9efb1 + c37dab7 commit 25e4366

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/librustdoc/html/render.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1117,11 +1117,7 @@ themePicker.onblur = handleThemeButtonsBlur;
11171117
// with rustdoc running in parallel.
11181118
all_indexes.sort();
11191119
let mut w = try_err!(File::create(&dst), &dst);
1120-
if options.enable_minification {
1121-
try_err!(writeln!(&mut w, "var N=null,E=\"\",T=\"t\",U=\"u\",searchIndex={{}};"), &dst);
1122-
} else {
1123-
try_err!(writeln!(&mut w, "var searchIndex={{}};"), &dst);
1124-
}
1120+
try_err!(writeln!(&mut w, "var N=null,E=\"\",T=\"t\",U=\"u\",searchIndex={{}};"), &dst);
11251121
try_err!(write_minify_replacer(&mut w,
11261122
&format!("{}\n{}", variables.join(""), all_indexes.join("\n")),
11271123
options.enable_minification),

0 commit comments

Comments
 (0)