Rollup merge of rust-lang#97894 - ehuss:fix-polonius-compare-mode, r=jackh726

compiler-errors · web-flow · commit cfc067799266 · 2022-06-08T13:32:26.000-07:00
Fix polonius compare mode. This fixes running compiler tests in `--compare-mode=polonius`. The `-Zborrowck=mir` option was removed in rust-lang#95565. r? `@jackh726`
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -1939,7 +1939,7 @@ impl<'test> TestCx<'test> {
 
         match self.config.compare_mode {
             Some(CompareMode::Polonius) => {
-                rustc.args(&["-Zpolonius", "-Zborrowck=mir"]);
+                rustc.args(&["-Zpolonius"]);
             }
             Some(CompareMode::Chalk) => {
                 rustc.args(&["-Zchalk"]);

Original file line number	Diff line number	Diff line change
`@@ -1939,7 +1939,7 @@ impl<'test> TestCx<'test> {`
`1939`	`1939`
`1940`	`1940`	`match self.config.compare_mode {`
`1941`	`1941`	`Some(CompareMode::Polonius) => {`
`1942`		`- rustc.args(&["-Zpolonius", "-Zborrowck=mir"]);`
	`1942`	`+ rustc.args(&["-Zpolonius"]);`
`1943`	`1943`	`}`
`1944`	`1944`	`Some(CompareMode::Chalk) => {`
`1945`	`1945`	`rustc.args(&["-Zchalk"]);`