about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorMatthew Jasper <mjjasper1@gmail.com>2019-04-22 08:40:08 +0100
committerMatthew Jasper <mjjasper1@gmail.com>2019-04-22 08:40:08 +0100
commit8eef102270647af94f38274efb9a2fd5ef8a92ec (patch)
tree95d7674ad687c45b730906915e79a0993138306b /src/tools
parentaa6fb6caf9d8456c70144ccba1e969c85926e229 (diff)
downloadrust-8eef102270647af94f38274efb9a2fd5ef8a92ec.tar.gz
rust-8eef102270647af94f38274efb9a2fd5ef8a92ec.zip
update tests for migrate mode by default
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/compiletest/src/runtest.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 6df56168973..d7a5395757f 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1886,10 +1886,11 @@ impl<'test> TestCx<'test> {
 
         match self.config.compare_mode {
             Some(CompareMode::Nll) => {
-                rustc.args(&["-Zborrowck=migrate", "-Ztwo-phase-borrows"]);
+                // FIXME(#56993) use -Zborrowck=mir
+                rustc.args(&["-Zborrowck=migrate"]);
             }
             Some(CompareMode::Polonius) => {
-                rustc.args(&["-Zpolonius", "-Zborrowck=mir", "-Ztwo-phase-borrows"]);
+                rustc.args(&["-Zpolonius", "-Zborrowck=mir"]);
             }
             None => {}
         }