From a64d30b2c19d3e48978bcb2eb39d53115da331f5 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Wed, 7 Dec 2016 22:56:28 -0800 Subject: [PATCH] Replace some stray `try!`s with `?`. --- src/eval_context.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eval_context.rs b/src/eval_context.rs index 85c829ede12b..f2070b961f09 100644 --- a/src/eval_context.rs +++ b/src/eval_context.rs @@ -520,7 +520,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> { if let mir::AggregateKind::Adt(_, variant, _, _) = *kind { if nndiscr == variant as u64 { let offsets = nonnull.offsets.iter().map(|s| s.bytes()); - try!(self.assign_fields(dest, offsets, operands)); + self.assign_fields(dest, offsets, operands)?; } else { for operand in operands { let operand_ty = self.operand_ty(operand); @@ -533,7 +533,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> { let dest = dest.offset(offset.bytes()); let dest_size = self.type_size(ty)?.expect("bad StructWrappedNullablePointer discrfield"); - try!(self.memory.write_int(dest, 0, dest_size)); + self.memory.write_int(dest, 0, dest_size)?; } } else { bug!("tried to assign {:?} to Layout::RawNullablePointer", kind);