From a4185fb9f9ac1a944d36c7e11b78dcca5453c312 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Sat, 16 May 2026 09:34:38 +0200 Subject: [PATCH] refactor: drop `-Zunstable-options` for `rustdoc --emit` `--emit` is now stable in rustdoc: rust-lang/rust#146220 `-Zunstable-options` flag is still required for `-Zrustdoc-mergeable-info` related flags. --- src/cargo/core/compiler/mod.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index b23e9ff9c58..5a6b669604d 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -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.