Skip to content

Commit b9c2722

Browse files
committed
Auto merge of #9890 - ehuss:remove-z-force-warn, r=alexcrichton
Fix `cargo fix --edition` on stable. I accidentally missed the removal of a `-Zunstable-options` flag in #9800. This prevented `cargo fix --edition` from working on stable/beta.
2 parents e515c32 + 1ae99da commit b9c2722

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/cargo/ops/fix.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -857,8 +857,7 @@ impl FixArgs {
857857
if edition.supports_compat_lint() {
858858
if env::var_os(SUPPORTS_FORCE_WARN).is_some() {
859859
cmd.arg("--force-warn")
860-
.arg(format!("rust-{}-compatibility", edition))
861-
.arg("-Zunstable-options");
860+
.arg(format!("rust-{}-compatibility", edition));
862861
} else {
863862
cmd.arg("-W").arg(format!("rust-{}-compatibility", edition));
864863
}

0 commit comments

Comments
 (0)