Update Cargo.lock and some improvements

Author: bjorn3

Cargo.toml

@@ -23,7 +23,7 @@ path = "miri/lib.rs"
 
 [dependencies]
 byteorder = { version = "1.1", features = ["i128"]}
-cargo_metadata = { version = "0.2", optional = true }
+cargo_metadata = { version = "0.5", optional = true }
 regex = "0.2.2"
 lazy_static = "1.0"
 env_logger = "0.5.0-rc.1"

miri/bin/cargo-miri.rs

@@ -121,7 +121,9 @@ fn main() {
 
         let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME"));
         let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN"));
-        let sys_root = if let (Some(home), Some(toolchain)) = (home, toolchain) {
+        let sys_root = if let Ok(sysroot) = ::std::env::var("MIRI_SYSROOT") {
+            sysroot
+        } else if let (Some(home), Some(toolchain)) = (home, toolchain) {
             format!("{}/toolchains/{}", home, toolchain)
         } else {
             option_env!("RUST_SYSROOT")

miri/fn_call.rs

@@ -444,7 +444,6 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
 
             "sysconf" => {
                 let name = self.value_to_primval(args[0])?.to_u64()?;
-                let name_align = self.layout_of(args[0].ty)?.align;
 
                 trace!("sysconf() called with name {}", name);
                 // cache the sysconf integers via miri's global cache

miri/lib.rs

@@ -173,6 +173,7 @@ pub fn eval_main<'a, 'tcx: 'a>(
             }
         }
         Err(mut e) => {
+            ecx.tcx.err(&e.to_string());
             ecx.report(&mut e, true, None);
         }
     }