Merge pull request #377 from bjorn3/rustup_2018-05-10

Rustup to 1.27.0-nightly (acd3871ba 2018-05-10)
This commit is contained in:
Oliver Schneider 2018-05-11 10:08:36 +02:00 committed by GitHub
commit 6fdee31f2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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 {