Merge pull request #54 from dtolnay/mirai

Disregard MIRAI's rustc wrapper
dtolnay · Oct 14, 2024 · 837b529 · 837b529
2 parents 6346c4e + 79670bd
commit 837b529
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/build/build.rs b/build/build.rs
@@ -21,10 +21,16 @@ fn main() {
     let wrapped_rustc = rustc_wrapper.iter().chain(iter::once(&rustc));
 
     let mut is_clippy_driver = false;
+    let mut is_mirai = false;
     let version = loop {
-        let mut wrapped_rustc = wrapped_rustc.clone();
-        let mut command = Command::new(wrapped_rustc.next().unwrap());
-        command.args(wrapped_rustc);
+        let mut command;
+        if is_mirai {
+            command = Command::new(&rustc);
+        } else {
+            let mut wrapped_rustc = wrapped_rustc.clone();
+            command = Command::new(wrapped_rustc.next().unwrap());
+            command.args(wrapped_rustc);
+        }
         if is_clippy_driver {
             command.arg("--rustc");
         }
@@ -57,7 +63,13 @@ fn main() {
                 is_clippy_driver = true;
                 continue;
             }
-            rustc::ParseResult::Unrecognized | rustc::ParseResult::OopsClippy => {
+            rustc::ParseResult::OopsMirai if !is_mirai && rustc_wrapper.is_some() => {
+                is_mirai = true;
+                continue;
+            }
+            rustc::ParseResult::Unrecognized
+            | rustc::ParseResult::OopsClippy
+            | rustc::ParseResult::OopsMirai => {
                 eprintln!(
                     "Error: unexpected output from `rustc --version`: {:?}\n\n\
                     Please file an issue in https://github.com/dtolnay/rustversion",

diff --git a/build/rustc.rs b/build/rustc.rs
@@ -4,6 +4,7 @@ use std::fmt::{self, Debug};
 pub enum ParseResult {
     Success(Version),
     OopsClippy,
+    OopsMirai,
     Unrecognized,
 }
 
@@ -36,6 +37,7 @@ pub fn parse(string: &str) -> ParseResult {
     match words.next() {
         Some("rustc") => {}
         Some(word) if word.starts_with("clippy") => return ParseResult::OopsClippy,
+        Some("mirai") => return ParseResult::OopsMirai,
         Some(_) | None => return ParseResult::Unrecognized,
     }
 

diff --git a/tests/test_parse.rs b/tests/test_parse.rs
@@ -95,7 +95,7 @@ fn test_parse() {
     for (string, expected) in cases {
         match parse(string) {
             ParseResult::Success(version) => assert_eq!(version, *expected),
-            ParseResult::OopsClippy | ParseResult::Unrecognized => {
+            ParseResult::OopsClippy | ParseResult::OopsMirai | ParseResult::Unrecognized => {
                 panic!("unrecognized: {:?}", string);
             }
         }