about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorJack Huey <31162821+jackh726@users.noreply.github.com>2022-04-01 13:13:25 -0400
committerJack Huey <31162821+jackh726@users.noreply.github.com>2022-06-03 17:16:41 -0400
commit410dcc96741716bf1b4dc9b3bf33f408f220384d (patch)
tree7c0b73e8a30be7529a8c9ce4e63a76adfa9327a1 /src/bootstrap
parent7e9b92cb43a489b34e2bcb8d21f36198e02eedbc (diff)
downloadrust-410dcc96741716bf1b4dc9b3bf33f408f220384d.tar.gz
rust-410dcc96741716bf1b4dc9b3bf33f408f220384d.zip
Fully stabilize NLL
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/flags.rs2
-rw-r--r--src/bootstrap/test.rs7
2 files changed, 2 insertions, 7 deletions
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
index 9827a6c590b..f692ff72d4e 100644
--- a/src/bootstrap/flags.rs
+++ b/src/bootstrap/flags.rs
@@ -452,7 +452,7 @@ Arguments:
         ./x.py test library/std --test-args hash_map
         ./x.py test library/std --stage 0 --no-doc
         ./x.py test src/test/ui --bless
-        ./x.py test src/test/ui --compare-mode nll
+        ./x.py test src/test/ui --compare-mode chalk
 
     Note that `test src/test/* --stage N` does NOT depend on `build compiler/rustc --stage N`;
     just like `build library/std --stage N` it tests the compiler produced by the previous
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index b71bf62fe45..8a236ec5130 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1167,12 +1167,7 @@ macro_rules! test_definitions {
     };
 }
 
-default_test_with_compare_mode!(Ui {
-    path: "src/test/ui",
-    mode: "ui",
-    suite: "ui",
-    compare_mode: "nll"
-});
+default_test!(Ui { path: "src/test/ui", mode: "ui", suite: "ui" });
 
 default_test!(RunPassValgrind {
     path: "src/test/run-pass-valgrind",