diff options
| author | Ralf Jung <post@ralfj.de> | 2018-09-22 13:36:46 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2018-10-10 09:51:16 +0200 |
| commit | f3a39e38f6109b2e0080a45ae47406796c2eac59 (patch) | |
| tree | 42df4eaefa650c498a5d2907258a3c891195e9ff | |
| parent | 4e9f9329e3e2143b558a9ed80c220d5d01f6bd02 (diff) | |
| download | rust-f3a39e38f6109b2e0080a45ae47406796c2eac59.tar.gz rust-f3a39e38f6109b2e0080a45ae47406796c2eac59.zip | |
tidy, oh tidy
| -rw-r--r-- | src/librustc_mir/interpret/eval_context.rs | 10 | ||||
| -rw-r--r-- | src/librustc_mir/interpret/place.rs | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs index cf4ff448ee5..a9fba995f02 100644 --- a/src/librustc_mir/interpret/eval_context.rs +++ b/src/librustc_mir/interpret/eval_context.rs @@ -230,7 +230,10 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tc /// Mark a storage as live, killing the previous content and returning it. /// Remember to deallocate that! - pub fn storage_live(&mut self, local: mir::Local) -> EvalResult<'tcx, LocalValue<M::PointerTag>> { + pub fn storage_live( + &mut self, + local: mir::Local + ) -> EvalResult<'tcx, LocalValue<M::PointerTag>> { assert!(local != mir::RETURN_PLACE, "Cannot make return place live"); trace!("{:?} is now live", local); @@ -519,7 +522,10 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tc Ok(()) } - pub(super) fn deallocate_local(&mut self, local: LocalValue<M::PointerTag>) -> EvalResult<'tcx> { + pub(super) fn deallocate_local( + &mut self, + local: LocalValue<M::PointerTag>, + ) -> EvalResult<'tcx> { // FIXME: should we tell the user that there was a local which was never written to? if let LocalValue::Live(Operand::Indirect(MemPlace { ptr, .. })) = local { trace!("deallocating local"); diff --git a/src/librustc_mir/interpret/place.rs b/src/librustc_mir/interpret/place.rs index 988711e2f34..2dc4b4112ae 100644 --- a/src/librustc_mir/interpret/place.rs +++ b/src/librustc_mir/interpret/place.rs @@ -557,7 +557,10 @@ impl /// Compute a place. You should only use this if you intend to write into this /// place; for reading, a more efficient alternative is `eval_place_for_read`. - pub fn eval_place(&mut self, mir_place: &mir::Place<'tcx>) -> EvalResult<'tcx, PlaceTy<'tcx, M::PointerTag>> { + pub fn eval_place( + &mut self, + mir_place: &mir::Place<'tcx> + ) -> EvalResult<'tcx, PlaceTy<'tcx, M::PointerTag>> { use rustc::mir::Place::*; let place = match *mir_place { Local(mir::RETURN_PLACE) => PlaceTy { @@ -805,7 +808,10 @@ impl /// Every place can be read from, so we can turm them into an operand #[inline(always)] - pub fn place_to_op(&self, place: PlaceTy<'tcx, M::PointerTag>) -> EvalResult<'tcx, OpTy<'tcx, M::PointerTag>> { + pub fn place_to_op( + &self, + place: PlaceTy<'tcx, M::PointerTag> + ) -> EvalResult<'tcx, OpTy<'tcx, M::PointerTag>> { let op = match place.place { Place::Ptr(mplace) => { Operand::Indirect(mplace) |
