Remove -Z miri debugging option

diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index 3dd9b6840591bf8d189b92a5bc37aba94d4b9acd..b6ae824c376017e740d086bade325ed36847ba55 100644 (file)
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -247,9 +247,6 @@ fn main() {
         // When running miri tests, we need to generate MIR for all libraries
         if env::var("TEST_MIRI").ok().map_or(false, |val| val == "true") {
             cmd.arg("-Zalways-encode-mir");
-            if stage != "0" {
-                cmd.arg("-Zmiri");
-            }
             cmd.arg("-Zmir-emit-validate=1");
         }
 

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index c175d2c69016f926ff6d24cdc74e97eb408b7d67..aff48799526d14936e6dd15d913f413dc1df3135 100644 (file)
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -875,7 +875,7 @@ fn run(self, builder: &Builder) {
         if build.config.rust_debuginfo_tests {
             flags.push("-g".to_string());
         }
-        flags.push("-Zmiri -Zunstable-options".to_string());
+        flags.push("-Zunstable-options".to_string());
         flags.push(build.config.cmd.rustc_args().join(" "));
 
         if let Some(linker) = build.linker(target) {

diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index a07370e1e42a7649f53787ab85c38bc2844cfb0c..f0b4d0cc70a92abb6522555363f193d91f9a1ce1 100644 (file)
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -1229,8 +1229,6 @@ fn parse_edition(slot: &mut Edition, v: Option<&str>) -> bool {
           "print some statistics about MIR"),
     always_encode_mir: bool = (false, parse_bool, [TRACKED],
           "encode MIR of all functions into the crate metadata"),
-    miri: bool = (false, parse_bool, [TRACKED],
-          "check the miri const evaluator against the old ctfe"),
     osx_rpath_install_name: bool = (false, parse_bool, [TRACKED],
           "pass `-install_name @rpath/...` to the macOS linker"),
     sanitizer: Option<Sanitizer> = (None, parse_sanitizer, [TRACKED],