mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #2122 - RalfJung:rustup, r=RalfJung

Browse Source 
rustup

I am on mobile and so I couldn't test this... let's see how it goes. ;)
This commit is contained in:
bors 2022-05-15 10:58:41 +00:00
commit 19ef76477c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
2d691170885b32502b391b8b1a0d54d2419a5653
e1ec3260d79497080ca86540562d410ba67d2a95

3
src/shims/posix/sync.rs
View File

@ -876,8 +876,7 @@ fn pthread_cond_destroy(&mut self, cond_op: &OpTy<'tcx, Tag>) -> InterpResult<'t
fn layout_of_maybe_uninit<'tcx>(tcx: TyCtxtAt<'tcx>, param: Ty<'tcx>) -> TyAndLayout<'tcx> {
let def_id = tcx.require_lang_item(LangItem::MaybeUninit, None);
let def_ty = tcx.type_of(def_id);
let ty = def_ty.subst(*tcx, &[param.into()]);
let ty = tcx.bound_type_of(def_id).subst(*tcx, &[param.into()]);
let param_env = tcx.param_env(def_id);
tcx.layout_of(param_env.and(ty)).unwrap()