Skip to content

Commit f3a39e3

Browse files
committed
tidy, oh tidy
1 parent 4e9f932 commit f3a39e3

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

src/librustc_mir/interpret/eval_context.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,10 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tc
230230

231231
/// Mark a storage as live, killing the previous content and returning it.
232232
/// Remember to deallocate that!
233-
pub fn storage_live(&mut self, local: mir::Local) -> EvalResult<'tcx, LocalValue<M::PointerTag>> {
233+
pub fn storage_live(
234+
&mut self,
235+
local: mir::Local
236+
) -> EvalResult<'tcx, LocalValue<M::PointerTag>> {
234237
assert!(local != mir::RETURN_PLACE, "Cannot make return place live");
235238
trace!("{:?} is now live", local);
236239

@@ -519,7 +522,10 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tc
519522
Ok(())
520523
}
521524

522-
pub(super) fn deallocate_local(&mut self, local: LocalValue<M::PointerTag>) -> EvalResult<'tcx> {
525+
pub(super) fn deallocate_local(
526+
&mut self,
527+
local: LocalValue<M::PointerTag>,
528+
) -> EvalResult<'tcx> {
523529
// FIXME: should we tell the user that there was a local which was never written to?
524530
if let LocalValue::Live(Operand::Indirect(MemPlace { ptr, .. })) = local {
525531
trace!("deallocating local");

src/librustc_mir/interpret/place.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,10 @@ impl
557557

558558
/// Compute a place. You should only use this if you intend to write into this
559559
/// place; for reading, a more efficient alternative is `eval_place_for_read`.
560-
pub fn eval_place(&mut self, mir_place: &mir::Place<'tcx>) -> EvalResult<'tcx, PlaceTy<'tcx, M::PointerTag>> {
560+
pub fn eval_place(
561+
&mut self,
562+
mir_place: &mir::Place<'tcx>
563+
) -> EvalResult<'tcx, PlaceTy<'tcx, M::PointerTag>> {
561564
use rustc::mir::Place::*;
562565
let place = match *mir_place {
563566
Local(mir::RETURN_PLACE) => PlaceTy {
@@ -805,7 +808,10 @@ impl
805808

806809
/// Every place can be read from, so we can turm them into an operand
807810
#[inline(always)]
808-
pub fn place_to_op(&self, place: PlaceTy<'tcx, M::PointerTag>) -> EvalResult<'tcx, OpTy<'tcx, M::PointerTag>> {
811+
pub fn place_to_op(
812+
&self,
813+
place: PlaceTy<'tcx, M::PointerTag>
814+
) -> EvalResult<'tcx, OpTy<'tcx, M::PointerTag>> {
809815
let op = match place.place {
810816
Place::Ptr(mplace) => {
811817
Operand::Indirect(mplace)

0 commit comments

Comments
 (0)