Merge pull request #537 from solson/rustup

bump Rust
This commit is contained in:
Oliver S̶c̶h̶n̶e̶i̶d̶e̶r Scherer 2018-11-21 11:15:00 +01:00 committed by GitHub
commit a6401e7d1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions

View file

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

View file

@ -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;

View file

@ -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));
}

View file

@ -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);
}