Skip to content

Commit

Permalink
Auto merge of #9714 - PTNobel:fix-force-warn, r=ehuss
Browse files Browse the repository at this point in the history
Changes rustc argument from `--force-warns` to `--force-warn`

The rustc argument was renamed in rust-lang/rust#87346 breaking `cargo fix` on the nightly toolchain.

I encountered this while attempting to test Edition 2021 migrations.

I ran `RUSTC=/path/to/nightly/rustc cargo test` and encountered a few failing tests, but none of them seemed at all related to the 1 line I changed, so if they crop up in CI as well, would love some help on identifying what's causing that.

Closes rust-lang/rust#87360
  • Loading branch information
bors committed Jul 22, 2021
2 parents 706c291 + 3dc2018 commit cebef29
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cargo/ops/fix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ impl FixArgs {
if let Some(edition) = self.prepare_for_edition {
if edition.supports_compat_lint() {
if config.nightly_features_allowed {
cmd.arg("--force-warns")
cmd.arg("--force-warn")
.arg(format!("rust-{}-compatibility", edition))
.arg("-Zunstable-options");
} else {
Expand Down

0 comments on commit cebef29

Please sign in to comment.