Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 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))
})?;
}

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",
"disable the minification of CSS/JS files (perma-unstable, do not use with cached files)",
"",
),
// deprecated / removed options
opt(Unstable, FlagMulti, "", "disable-minification", "removed", ""),
opt(
Stable,
Multi,
Expand Down
3 changes: 2 additions & 1 deletion tests/run-make/rustdoc-default-output/output-default.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ Options:
--doctest-compilation-args add arguments to be used when compiling doctests

--disable-minification
removed
disable the minification of CSS/JS files
(perma-unstable, do not use with cached files)
--plugin-path DIR
removed, see issue #44136
<https://github.com/rust-lang/rust/issues/44136> for
Expand Down
Loading