Use the same message as type & const generics.

[rust.git] / src / bootstrap / test.rs

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index bc851568f896b95076ef5926dc01af6f66d380ae..b71bf62fe45df8f17aa43f020cfc7baa1d5aad65 100644 (file)
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -572,12 +572,6 @@ fn run(self, builder: &Builder<'_>) {
                 return;
             }
 
-            // # Run `cargo test` with `-Zmir-opt-level=4`.
-            cargo.env("MIRIFLAGS", "-O -Zmir-opt-level=4");
-            if !try_run(builder, &mut cargo) {
-                return;
-            }
-
             // # Done!
             builder.save_toolstate("miri", ToolState::TestPass);
         } else {
@@ -2058,7 +2052,7 @@ fn run(self, builder: &Builder<'_>) {
         let test_kind = self.test_kind;
         let target = self.host;
 
-        let compiler = if builder.config.download_rustc {
+        let compiler = if builder.download_rustc() {
             builder.compiler(builder.top_stage, target)
         } else {
             // Use the previous stage compiler to reuse the artifacts that are
@@ -2127,7 +2121,7 @@ fn run(self, builder: &Builder<'_>) {
         // with.
         //
         // Note that this set the host libdir for `download_rustc`, which uses a normal rust distribution.
-        let libdir = if builder.config.download_rustc {
+        let libdir = if builder.download_rustc() {
             builder.rustc_libdir(compiler)
         } else {
             builder.sysroot_libdir(compiler, target).to_path_buf()