re-add --disable-minification to rustdoc

this also makes the rust.docs-minification option work
as advertised in config.toml

nothing fancy this time, this is intended to be perma-unstable.
it's only really here for the benefit of rustdoc devs.

mitegates https://github.com/rust-lang/rust/issues/135345
This commit is contained in:
binarycat 2025-01-10 16:45:32 -06:00
parent 251206c27b
commit d4057e8df0
4 changed files with 24 additions and 3 deletions

View file

@ -303,6 +303,8 @@ pub(crate) struct RenderOptions {
pub(crate) include_parts_dir: Vec<PathToParts>,
/// Where to write crate-info
pub(crate) parts_out_dir: Option<PathToParts>,
/// disable minification of CSS/JS
pub(crate) disable_minification: bool,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
@ -781,6 +783,9 @@ impl Options {
let unstable_features =
rustc_feature::UnstableFeatures::from_environment(crate_name.as_deref());
let disable_minification = matches.opt_present("disable-minification");
let options = Options {
bin_crate,
proc_macro_crate,
@ -857,6 +862,7 @@ impl Options {
should_merge,
include_parts_dir,
parts_out_dir,
disable_minification,
};
Some((input, options, render_options))
}

View file

@ -207,7 +207,15 @@ fn write_static_files(
if opt.emit.is_empty() || opt.emit.contains(&EmitType::Toolchain) {
static_files::for_each(|f: &static_files::StaticFile| {
let filename = static_dir.join(f.output_filename());
fs::write(&filename, f.minified()).map_err(|e| PathError::new(e, &filename))
let contents: &[u8];
let contents_vec: Vec<u8>;
if opt.disable_minification {
contents = f.bytes;
} else {
contents_vec = f.minified();
contents = &contents_vec;
};
fs::write(&filename, contents).map_err(|e| PathError::new(e, &filename))
})?;
}

View file

@ -651,8 +651,15 @@ fn opts() -> Vec<RustcOptGroup> {
"",
"add arguments to be used when compiling doctests",
),
opt(
Unstable,
FlagMulti,
"",
"disable-minification",
"diable the minification of CSS/JS files",
"",
),
// deprecated / removed options
opt(Unstable, FlagMulti, "", "disable-minification", "removed", ""),
opt(
Stable,
Multi,

View file

@ -194,7 +194,7 @@ Options:
--doctest-compilation-args add arguments to be used when compiling doctests
--disable-minification
removed
diable the minification of CSS/JS files
--plugin-path DIR
removed, see issue #44136
<https://github.com/rust-lang/rust/issues/44136> for