Skip to content
Merged
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
4 changes: 1 addition & 3 deletions src/cargo/core/compiler/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -903,16 +903,14 @@ fn prepare_rustdoc(build_runner: &BuildRunner<'_, '_>, unit: &Unit) -> CargoResu
if build_runner.bcx.gctx.cli_unstable().checksum_freshness {
rustdoc.arg("-Z").arg("checksum-hash-algorithm=blake3");
}

rustdoc.arg("-Zunstable-options");
} else if build_runner.bcx.gctx.cli_unstable().rustdoc_mergeable_info {
// toolchain resources are written at the end, at the same time as merging
rustdoc.arg("--emit=html-non-static-files");
rustdoc.arg("-Zunstable-options");
}

if build_runner.bcx.gctx.cli_unstable().rustdoc_mergeable_info {
// write out mergeable data to be imported
rustdoc.arg("-Zunstable-options");
rustdoc.arg("--merge=none");
let mut arg = OsString::from("--parts-out-dir=");
// `-Zrustdoc-mergeable-info` always uses the new layout.
Expand Down
Loading