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

rustup

I am on mobile and so I couldn't test this... let's see how it goes. ;)

Author: bors

rust-version

@@ -1 +1 @@
-2d691170885b32502b391b8b1a0d54d2419a5653
+e1ec3260d79497080ca86540562d410ba67d2a95

src/shims/posix/sync.rs

@@ -876,8 +876,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
 
 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()