Merge pull request #3 from oli-obk/sync

Sync with miri

Author: oli-obk

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.formatOnSave": true
+}

src/lib.rs

@@ -1,4 +1,9 @@
-#![allow(clippy::enum_variant_names, clippy::useless_format, clippy::too_many_arguments)]
+#![allow(
+    clippy::enum_variant_names,
+    clippy::useless_format,
+    clippy::too_many_arguments,
+    rustc::internal
+)]
 
 use std::collections::VecDeque;
 use std::ffi::OsString;
@@ -194,9 +199,9 @@ pub fn run_tests(mut config: Config) -> Result<()> {
                             run_test(&path, &config, &target, &revision, &comments);
 
                         // Using a single `eprintln!` to prevent messages from threads from getting intermingled.
-                        let mut msg = format!("{} ", path.display());
+                        let mut msg = format!("{}", path.display());
                         if !revision.is_empty() {
-                            write!(msg, "(revision `{revision}`) ").unwrap();
+                            write!(msg, " (revision `{revision}`) ").unwrap();
                         }
                         if errors.is_empty() {
                             finished_files_sender.send((msg, TestResult::Ok))?;
@@ -267,7 +272,7 @@ pub fn run_tests(mut config: Config) -> Result<()> {
                     }
                     Error::ErrorsWithoutPattern { path: None, msgs } => {
                         eprintln!(
-                            "There were {} unmatched diagnostics that occurred outside the testfile and had not pattern",
+                            "There were {} unmatched diagnostics that occurred outside the testfile and had no pattern",
                             msgs.len(),
                         );
                         for Message { level, message } in msgs {
@@ -624,8 +629,8 @@ pub enum Mode {
 
 impl Mode {
     fn ok(self, status: ExitStatus) -> Errors {
-        match (status.code().unwrap(), self) {
-            (1, Mode::Fail) | (101, Mode::Panic) | (0, Mode::Pass) => vec![],
+        match (status.code(), self) {
+            (Some(1), Mode::Fail) | (Some(101), Mode::Panic) | (Some(0), Mode::Pass) => vec![],
             _ => vec![Error::ExitStatus(self, status)],
         }
     }