From 65ff27b702068ecbe3d4069b01c52a15b2965cf8 Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Sun, 4 Feb 2018 20:30:06 -0500
Subject: [PATCH] rustup: layout_of()
---
src/eval_context.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/eval_context.rs b/src/eval_context.rs
index baa3ec7..da25b1b 100644
--- a/src/eval_context.rs
+++ b/src/eval_context.rs
@@ -202,7 +202,7 @@ impl<'a, 'tcx> LayoutOf<Ty<'tcx>> for &'a EvalContext<'a, 'tcx> {
type TyLayout = EvalResult<'tcx, TyLayout<'tcx>>;
fn layout_of(self, ty: Ty<'tcx>) -> Self::TyLayout {
- (self.tcx, ::rustc::ty::ParamEnv::empty(Reveal::All)).layout_of(ty)
+ self.tcx.layout_of(::rustc::ty::ParamEnv::empty(Reveal::All).and(ty))
.map_err(|layout| EvalError::Layout(layout).into())
}
}
--
GitLab