From e07c1542ac4ab8bfd67748a604ddbe5fa766e408 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 23 Aug 2018 09:34:21 -0700 Subject: [PATCH] Fixed multi-line function signatures --- src/librustc_mir/interpret/eval_context.rs | 2 +- src/librustc_mir/interpret/memory.rs | 8 ++++++-- src/librustc_mir/interpret/place.rs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs index 85942956d2e..fa70a1500d0 100644 --- a/src/librustc_mir/interpret/eval_context.rs +++ b/src/librustc_mir/interpret/eval_context.rs @@ -396,7 +396,7 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M &self, def_id: DefId, substs: &'tcx Substs<'tcx> - ) -> EvalResult<'tcx, ty::Instance<'tcx>> { + ) -> EvalResult<'tcx, ty::Instance<'tcx>> { trace!("resolve: {:?}, {:#?}", def_id, substs); trace!("substs: {:#?}", self.substs()); trace!("param_env: {:#?}", self.param_env); diff --git a/src/librustc_mir/interpret/memory.rs b/src/librustc_mir/interpret/memory.rs index 0d0b7bac87b..6f1a126534c 100644 --- a/src/librustc_mir/interpret/memory.rs +++ b/src/librustc_mir/interpret/memory.rs @@ -789,8 +789,12 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> { } /// Read a *non-ZST* scalar - pub fn read_scalar(&self, ptr: Pointer, ptr_align: Align, size: Size) - -> EvalResult<'tcx, ScalarMaybeUndef> { + pub fn read_scalar( + &self, + ptr: Pointer, + ptr_align: Align, + size: Size + ) -> EvalResult<'tcx, ScalarMaybeUndef> { // Make sure we don't read part of a pointer as a pointer self.check_relocation_edges(ptr, size)?; let endianness = self.endianness(); diff --git a/src/librustc_mir/interpret/place.rs b/src/librustc_mir/interpret/place.rs index f46d6a1ea7d..f1c2b6b34fb 100644 --- a/src/librustc_mir/interpret/place.rs +++ b/src/librustc_mir/interpret/place.rs @@ -776,7 +776,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M> { pub fn unpack_unsized_mplace( &self, mplace: MPlaceTy<'tcx> - ) -> EvalResult<'tcx, MPlaceTy<'tcx>> { + ) -> EvalResult<'tcx, MPlaceTy<'tcx>> { trace!("Unpacking {:?} ({:?})", *mplace, mplace.layout.ty); let layout = match mplace.extra { PlaceExtra::Vtable(vtable) => {