Merge pull request #537 from solson/rustup

bump Rust

Author: oli-obk

rust-version

@@ -1 +1 @@
-nightly-2018-11-20
+nightly-2018-11-21

src/fn_call.rs

@@ -469,10 +469,9 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx, 'mir> for super::MiriEvalCo
                             instance,
                             promoted: None,
                         };
-                        let const_val = self.const_eval(cid)?;
-                        let value = const_val.unwrap_bits(
-                            self.tcx.tcx,
-                            ty::ParamEnv::empty().and(self.tcx.types.i32)) as i32;
+                        let const_val = self.const_eval_raw(cid)?;
+                        let const_val = self.read_scalar(const_val.into())?;
+                        let value = const_val.to_i32()?;
                         if value == name {
                             result = Some(path_value);
                             break;

tests/compile-fail-fullmir/stacked_borrows/box_exclusive_violation1.rs

@@ -25,5 +25,5 @@ fn unknown_code_2() { unsafe {
 } }
 
 fn main() {
-    assert_eq!(demo_mut_advanced_unique(Box::new(0)), 5);
+    demo_mut_advanced_unique(Box::new(0));
 }

tests/compile-fail-fullmir/stacked_borrows/mut_exclusive_violation1.rs

@@ -25,5 +25,5 @@ fn unknown_code_2() { unsafe {
 } }
 
 fn main() {
-    assert_eq!(demo_mut_advanced_unique(&mut 0), 5);
+    demo_mut_advanced_unique(&mut 0);
 }