Auto merge of #9891 - ehuss:beta-remove-z-force-warn, r=alexcrichton

[beta] Fix `cargo fix --edition` on stable. Beta backport of #9890.
rust-lang · Sep 9, 2021 · d199d81 · d199d81
2 parents 18751dd + 82f48c6
commit d199d81
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/cargo/ops/fix.rs b/src/cargo/ops/fix.rs
@@ -857,8 +857,7 @@ impl FixArgs {
             if edition.supports_compat_lint() {
                 if env::var_os(SUPPORTS_FORCE_WARN).is_some() {
                     cmd.arg("--force-warn")
-                        .arg(format!("rust-{}-compatibility", edition))
-                        .arg("-Zunstable-options");
+                        .arg(format!("rust-{}-compatibility", edition));
                 } else {
                     cmd.arg("-W").arg(format!("rust-{}-compatibility", edition));
                 }