Rustup to rustc 1.36.0-nightly (f49269398 2019-05-25)
This commit is contained in:
parent
5db3fcd169
commit
610f377b7d
@ -41,9 +41,9 @@ index f6dee7c..0c6a8c0 100644
|
||||
- }
|
||||
-}
|
||||
-
|
||||
/// `FnBox` is a version of the `FnOnce` intended for use with boxed
|
||||
/// closure objects. The idea is that where one would normally store a
|
||||
/// `Box<dyn FnOnce()>` in a data structure, you should use
|
||||
/// `FnBox` is deprecated and will be removed.
|
||||
/// `Box<dyn FnOnce()>` can be called directly, since Rust 1.35.0.
|
||||
///
|
||||
diff --git a/src/libstd/sys_common/at_exit_imp.rs b/src/libstd/sys_common/at_exit_imp.rs
|
||||
index 1181b86..20f9251 100644
|
||||
--- a/src/libstd/sys_common/at_exit_imp.rs
|
||||
|
@ -65,7 +65,7 @@ pub fn trans_promoted<'a, 'tcx: 'a>(
|
||||
}))
|
||||
{
|
||||
Ok(const_) => {
|
||||
let cplace = trans_const_place(fx, const_);
|
||||
let cplace = trans_const_place(fx, *const_);
|
||||
debug_assert_eq!(cplace.layout(), fx.layout_of(dest_ty));
|
||||
cplace
|
||||
}
|
||||
@ -100,7 +100,7 @@ pub fn force_eval_const<'a, 'tcx: 'a>(
|
||||
instance,
|
||||
promoted: None,
|
||||
};
|
||||
fx.tcx.const_eval(param_env.and(cid)).unwrap()
|
||||
*fx.tcx.const_eval(param_env.and(cid)).unwrap()
|
||||
}
|
||||
_ => *fx.monomorphize(&const_),
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user