Auto merge of #9642 - ehuss:2021-edition-disable, r=alexcrichton

bors · bors · commit a15fec7817f6 · 2021-06-30T16:45:52.000Z
Temporarily ignore 2021 edition fix.

The latest nightly broke the interaction of `--force-warns` and `--cap-lints`.  Since this will likely take at least a few days to fix, I am temporarily disabling this test to get cargo's CI working again.
diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs
@@ -1503,6 +1503,7 @@ fn rustfix_handles_multi_spans() {
 }
 
 #[cargo_test]
+#[ignore] // Broken, see https://github.com/rust-lang/rust/pull/86009
 fn fix_edition_2021() {
     // Can migrate 2021, even when lints are allowed.
     if !is_nightly() {

Original file line number	Diff line number	Diff line change
`@@ -1503,6 +1503,7 @@ fn rustfix_handles_multi_spans() {`
`1503`	`1503`	`}`
`1504`	`1504`
`1505`	`1505`	`#[cargo_test]`
	`1506`	`+#[ignore] // Broken, see https://github.com/rust-lang/rust/pull/86009`
`1506`	`1507`	`fn fix_edition_2021() {`
`1507`	`1508`	`// Can migrate 2021, even when lints are allowed.`
`1508`	`1509`	`if !is_nightly() {`