Skip to content

Commit 610f377

Browse files
committed
Rustup to rustc 1.36.0-nightly (f49269398 2019-05-25)
1 parent 5db3fcd commit 610f377

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

patches/0015-Remove-usage-of-unsized-locals.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ index f6dee7c..0c6a8c0 100644
4141
- }
4242
-}
4343
-
44-
/// `FnBox` is a version of the `FnOnce` intended for use with boxed
45-
/// closure objects. The idea is that where one would normally store a
46-
/// `Box<dyn FnOnce()>` in a data structure, you should use
44+
/// `FnBox` is deprecated and will be removed.
45+
/// `Box<dyn FnOnce()>` can be called directly, since Rust 1.35.0.
46+
///
4747
diff --git a/src/libstd/sys_common/at_exit_imp.rs b/src/libstd/sys_common/at_exit_imp.rs
4848
index 1181b86..20f9251 100644
4949
--- a/src/libstd/sys_common/at_exit_imp.rs

src/constant.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub fn trans_promoted<'a, 'tcx: 'a>(
6565
}))
6666
{
6767
Ok(const_) => {
68-
let cplace = trans_const_place(fx, const_);
68+
let cplace = trans_const_place(fx, *const_);
6969
debug_assert_eq!(cplace.layout(), fx.layout_of(dest_ty));
7070
cplace
7171
}
@@ -100,7 +100,7 @@ pub fn force_eval_const<'a, 'tcx: 'a>(
100100
instance,
101101
promoted: None,
102102
};
103-
fx.tcx.const_eval(param_env.and(cid)).unwrap()
103+
*fx.tcx.const_eval(param_env.and(cid)).unwrap()
104104
}
105105
_ => *fx.monomorphize(&const_),
106106
}

0 commit comments

Comments
 (0)