Skip to content

Commit 01bdccb

Browse files
committed
cargo fmt
1 parent 570f5d6 commit 01bdccb

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

src/borrow_tracker/mod.rs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -270,33 +270,23 @@ impl GlobalStateInner {
270270

271271
impl<'mir, 'tcx: 'mir> EvalContextExt<'mir, 'tcx> for crate::MiriInterpCx<'mir, 'tcx> {}
272272
pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
273-
fn retag(
274-
&mut self,
275-
kind: RetagKind,
276-
place: &PlaceTy<'tcx, Provenance>,
277-
) -> InterpResult<'tcx> {
273+
fn retag(&mut self, kind: RetagKind, place: &PlaceTy<'tcx, Provenance>) -> InterpResult<'tcx> {
278274
let this = self.eval_context_mut();
279275
let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().method();
280276
match method {
281277
BorrowTrackerMethod::StackedBorrows => this.sb_retag(kind, place),
282278
}
283279
}
284280

285-
fn retag_return_place(
286-
&mut self,
287-
) -> InterpResult<'tcx> {
281+
fn retag_return_place(&mut self) -> InterpResult<'tcx> {
288282
let this = self.eval_context_mut();
289283
let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().method();
290284
match method {
291285
BorrowTrackerMethod::StackedBorrows => this.sb_retag_return_place(),
292286
}
293287
}
294288

295-
fn expose_tag(
296-
&mut self,
297-
alloc_id: AllocId,
298-
tag: BorTag,
299-
) -> InterpResult<'tcx> {
289+
fn expose_tag(&mut self, alloc_id: AllocId, tag: BorTag) -> InterpResult<'tcx> {
300290
let this = self.eval_context_mut();
301291
let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().method();
302292
match method {

src/borrow_tracker/stacked_borrows/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ use std::cmp;
66
use std::fmt::{self, Write};
77

88
use rustc_data_structures::fx::FxHashSet;
9-
use rustc_target::abi::{Abi, Size};
109
use rustc_middle::mir::{Mutability, RetagKind};
1110
use rustc_middle::ty::{
1211
self,
1312
layout::{HasParamEnv, LayoutOf},
1413
};
14+
use rustc_target::abi::{Abi, Size};
1515

1616
use crate::borrow_tracker::{
1717
stacked_borrows::diagnostics::{AllocHistory, DiagnosticCx, DiagnosticCxBuilder, TagHistory},

0 commit comments

Comments
 (0)