From 4d314065a4e3e8d9b6823948c98a3441f5e2b55a Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 5 Mar 2026 13:40:20 +0100 Subject: [PATCH] Revert "library/test: always enable unstable features for miri" This reverts commit 30d7ed4c472d61258a6ec3c84c2daef23d9e7296. It should not be needed any more. --- library/test/build.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/library/test/build.rs b/library/test/build.rs index 3f7a5c16e5b1..8e31adbf2ca7 100644 --- a/library/test/build.rs +++ b/library/test/build.rs @@ -2,16 +2,11 @@ fn main() { println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rustc-check-cfg=cfg(enable_unstable_features)"); - // Miri testing uses unstable features, so always enable that for its sysroot. - // Otherwise, only enable unstable if rustc looks like a nightly or dev build. - let enable_unstable_features = std::env::var("MIRI_CALLED_FROM_SETUP").is_ok() || { - let rustc = std::env::var("RUSTC").unwrap_or_else(|_| "rustc".into()); - let version = std::process::Command::new(rustc).arg("-vV").output().unwrap(); - let stdout = String::from_utf8(version.stdout).unwrap(); - stdout.contains("nightly") || stdout.contains("dev") - }; + let rustc = std::env::var("RUSTC").unwrap_or_else(|_| "rustc".into()); + let version = std::process::Command::new(rustc).arg("-vV").output().unwrap(); + let stdout = String::from_utf8(version.stdout).unwrap(); - if enable_unstable_features { + if stdout.contains("nightly") || stdout.contains("dev") { println!("cargo:rustc-cfg=enable_unstable_features"); } }