More cleanup

Author: Aaron1011

src/bin/cargo-miri.rs

@@ -425,7 +425,7 @@ path = "lib.rs"
     // architecture matches the host.
     let is_host = match target {
         None => true,
-        Some(target) => target == host_triple(),
+        Some(target) => target == rustc_version::version_meta().unwrap().host,
     };
     let sysroot = if is_host { dir.join("HOST") } else { PathBuf::from(dir) };
     std::env::set_var("MIRI_SYSROOT", &sysroot); // pass the env var to the processes we spawn, which will turn it into "--sysroot" flags
@@ -517,7 +517,6 @@ fn in_cargo_miri() {
             // The remaining targets we do not even want to build.
             _ => continue,
         }
-
         // Add user-defined args until first `--`.
         while let Some(arg) = args.next() {
             if arg == "--" {
@@ -553,10 +552,6 @@ fn in_cargo_miri() {
     }
 }
 
-fn host_triple() -> String {
-    rustc_version::version_meta().unwrap().host
-}
-
 fn inside_cargo_rustc() {
     let sysroot = std::env::var("MIRI_SYSROOT").expect("The wrapper should have set MIRI_SYSROOT");