diff --git a/rust-version b/rust-version index 1c54dc72ba4..dd746e9e2ae 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -2d691170885b32502b391b8b1a0d54d2419a5653 +e1ec3260d79497080ca86540562d410ba67d2a95 diff --git a/src/shims/posix/sync.rs b/src/shims/posix/sync.rs index 56d49698475..1b6112a3311 100644 --- a/src/shims/posix/sync.rs +++ b/src/shims/posix/sync.rs @@ -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()