From 1ba6140891cb1ecaddcb097d22007938bbb34dcd Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 25 Aug 2018 21:22:06 +0200 Subject: [PATCH] rustup --- src/intrinsic.rs | 6 +++--- src/lib.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intrinsic.rs b/src/intrinsic.rs index ed8514863c19..6847d8e546f3 100644 --- a/src/intrinsic.rs +++ b/src/intrinsic.rs @@ -4,7 +4,7 @@ use rustc::ty; use rustc::mir::interpret::{EvalResult, Scalar, ScalarMaybeUndef}; use rustc_mir::interpret::{ - PlaceExtra, PlaceTy, EvalContext, OpTy, Value + PlaceTy, EvalContext, OpTy, Value }; use super::{ScalarExt, FalibleScalarExt, OperatorEvalContextExt}; @@ -293,7 +293,7 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'mir, 'tcx, super: _ => { // Do it in memory let mplace = self.force_allocation(dest)?; - assert_eq!(mplace.extra, PlaceExtra::None); + assert!(mplace.extra.is_none()); self.memory.write_repeat(mplace.ptr, 0, dest.layout.size)?; } } @@ -550,7 +550,7 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'mir, 'tcx, super: _ => { // Do it in memory let mplace = self.force_allocation(dest)?; - assert_eq!(mplace.extra, PlaceExtra::None); + assert!(mplace.extra.is_none()); self.memory.mark_definedness(mplace.ptr.to_ptr()?, dest.layout.size, false)?; } } diff --git a/src/lib.rs b/src/lib.rs index c3f411f23063..b0148c16f3e8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -315,7 +315,7 @@ impl<'mir, 'tcx: 'mir> Machine<'mir, 'tcx> for Evaluator<'tcx> { ) -> EvalResult<'tcx, &'m mut Allocation> { // Make a copy, use that. mem.deep_copy_static(id, MiriMemoryKind::MutStatic.into())?; - mem.get_mut(id) // this is recursive, but now we know that `id` is in `alloc_map` + mem.get_mut(id) // this is recursive, but now we know that `id` is in `alloc_map` now } fn box_alloc<'a>(