diff options
| author | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2017-02-06 21:23:26 +0100 |
|---|---|---|
| committer | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2017-02-08 22:23:21 +0100 |
| commit | d71988a1d44b33ec12958535a4e4e3d0c62d9256 (patch) | |
| tree | 94b530a52602964b54658ae36fc27672d4d9a3d2 | |
| parent | 3652c095cef1e7b0fe38a6d8efb48ebae22bf2ba (diff) | |
| download | rust-d71988a1d44b33ec12958535a4e4e3d0c62d9256.tar.gz rust-d71988a1d44b33ec12958535a4e4e3d0c62d9256.zip | |
pacify tidy
| -rw-r--r-- | src/librustc_trans/mir/block.rs | 8 | ||||
| -rw-r--r-- | src/librustc_trans/mir/rvalue.rs | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/librustc_trans/mir/block.rs b/src/librustc_trans/mir/block.rs index 9a4cfb6f984..f04f7ab9ed1 100644 --- a/src/librustc_trans/mir/block.rs +++ b/src/librustc_trans/mir/block.rs @@ -147,8 +147,9 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> { mir::TerminatorKind::Switch { ref discr, ref adt_def, ref targets } => { let discr_lvalue = self.trans_lvalue(&bcx, discr); let ty = discr_lvalue.ty.to_ty(bcx.tcx()); - let discr = adt::trans_get_discr(&bcx, ty, discr_lvalue.llval, discr_lvalue.alignment, - None, true); + let discr = adt::trans_get_discr( + &bcx, ty, discr_lvalue.llval, discr_lvalue.alignment, + None, true); let mut bb_hist = FxHashMap(); for target in targets { @@ -216,7 +217,8 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> { llscratch } Ref(llval, align) => { - assert_eq!(align, Alignment::AbiAligned, "return pointer is unaligned!"); + assert_eq!(align, Alignment::AbiAligned, + "return pointer is unaligned!"); llval } }; diff --git a/src/librustc_trans/mir/rvalue.rs b/src/librustc_trans/mir/rvalue.rs index be74e30ec74..0a8e676b078 100644 --- a/src/librustc_trans/mir/rvalue.rs +++ b/src/librustc_trans/mir/rvalue.rs @@ -113,7 +113,8 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> { let op = self.trans_operand(&bcx, operand); // Do not generate stores and GEPis for zero-sized fields. if !common::type_is_zero_size(bcx.ccx, op.ty) { - let mut val = LvalueRef::new_sized(dest.llval, dest.ty, dest.alignment); + let mut val = LvalueRef::new_sized( + dest.llval, dest.ty, dest.alignment); let field_index = active_field_index.unwrap_or(i); val.ty = LvalueTy::Downcast { adt_def: adt_def, |