Skip to content

Commit

Permalink
re-add --disable-minification to rustdoc
Browse files Browse the repository at this point in the history
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 #135345
  • Loading branch information
lolbinarycat committed Jan 11, 2025
1 parent 251206c commit 706fa7c
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
6 changes: 6 additions & 0 deletions src/librustdoc/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -857,6 +862,7 @@ impl Options {
should_merge,
include_parts_dir,
parts_out_dir,
disable_minification,
};
Some((input, options, render_options))
}
Expand Down
10 changes: 9 additions & 1 deletion src/librustdoc/html/render/write_shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 dbg!(opt.disable_minification) {

Check failure on line 212 in src/librustdoc/html/render/write_shared.rs

View workflow job for this annotation

GitHub Actions / PR - mingw-check-tidy

`dbg!` macro is intended as a debugging tool. It should not be in version control.
contents = f.bytes;
} else {
contents_vec = f.minified();
contents = &contents_vec;
};
fs::write(&filename, contents).map_err(|e| PathError::new(e, &filename))
})?;
}

Expand Down
9 changes: 8 additions & 1 deletion src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 706fa7c

Please sign in to comment.