From 8d6a893a4a47828fa0e9727545b6a0accf63a55d Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Fri, 11 May 2018 09:38:13 +0200 Subject: [PATCH] Rustup to 1.27.0-nightly (acd3871ba 2018-05-10) --- src/validation.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/validation.rs b/src/validation.rs index 8f444f19bd86..b274b4650157 100644 --- a/src/validation.rs +++ b/src/validation.rs @@ -401,7 +401,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, ' } // Potentially-fat pointers. - ty::TyRef(_, ty::TypeAndMut { ty: pointee, .. }) | + ty::TyRef(_, pointee, _) | ty::TyRawPtr(ty::TypeAndMut { ty: pointee, .. }) => { assert!(i < 2); @@ -658,11 +658,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, ' } } TyNever => return err!(ValidationFailure(format!("The empty type is never valid."))), - TyRef(region, - ty::TypeAndMut { - ty: pointee_ty, - mutbl, - }) => { + TyRef(region, pointee_ty, mutbl) => { let val = self.read_place(query.place.1)?; // Sharing restricts our context if mutbl == MutImmutable {