cargo fmt

Author: Vanille-N

src/borrow_tracker/mod.rs

@@ -7,8 +7,8 @@ use std::num::NonZeroU64;
 use log::trace;
 use smallvec::SmallVec;
 
-use stacked::diagnostics::{RetagCause};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use stacked::diagnostics::RetagCause;
 
 use crate::*;
 
@@ -251,15 +251,14 @@ impl Method {
         machine: &MiriMachine<'mir, 'tcx>,
     ) -> Option<State> {
         match self {
-            Method::StackedBorrows => {
+            Method::StackedBorrows =>
                 Some(State::Stack(RefCell::new(Stacks::new_allocation(
                     id,
                     alloc.size(),
                     global.unwrap(),
                     kind,
                     machine,
-                ))))
-            },
+                )))),
             Method::Off => None,
         }
     }
@@ -290,13 +289,7 @@ impl State {
     {
         match self {
             State::Stack(sb) =>
-                sb.borrow_mut().before_memory_read(
-                    alloc_id,
-                    prov_extra,
-                    range,
-                    state,
-                    machine,
-                ),
+                sb.borrow_mut().before_memory_read(alloc_id, prov_extra, range, state, machine),
         }
     }
 
@@ -310,13 +303,7 @@ impl State {
     ) -> InterpResult<'tcx> {
         match self {
             State::Stack(sb) =>
-                sb.get_mut().before_memory_write(
-                    alloc_id,
-                    prov_extra,
-                    range,
-                    state,
-                    machine,
-                ),
+                sb.get_mut().before_memory_write(alloc_id, prov_extra, range, state, machine),
         }
     }
 
@@ -330,13 +317,7 @@ impl State {
     ) -> InterpResult<'tcx> {
         match self {
             State::Stack(sb) =>
-                sb.get_mut().before_memory_deallocation(
-                    alloc_id,
-                    prov_extra,
-                    range,
-                    state,
-                    machine,
-                ),
+                sb.get_mut().before_memory_deallocation(alloc_id, prov_extra, range, state, machine),
         }
     }
 

src/borrow_tracker/stacked/diagnostics.rs

@@ -7,8 +7,7 @@ use rustc_target::abi::Size;
 
 use crate::borrow_tracker::{
     stacked::{err_sb_ub, Permission},
-    AccessKind, GlobalStateInner,
-    ProtectorKind,
+    AccessKind, GlobalStateInner, ProtectorKind,
 };
 use crate::*;
 

src/borrow_tracker/stacked/mod.rs

@@ -12,7 +12,7 @@ use rustc_target::abi::Size;
 
 use crate::borrow_tracker::{
     stacked::diagnostics::{AllocHistory, DiagnosticCx, DiagnosticCxBuilder, TagHistory},
-    AccessKind, GlobalState, GlobalStateInner, RetagCause, ProtectorKind, RetagFields,
+    AccessKind, GlobalState, GlobalStateInner, ProtectorKind, RetagCause, RetagFields,
 };
 use rustc_middle::{
     mir::{Mutability, RetagKind},

src/eval.rs

@@ -8,10 +8,10 @@ use std::thread;
 
 use log::info;
 
+use crate::borrow_tracker::RetagFields;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir::def::Namespace;
 use rustc_hir::def_id::DefId;
-use crate::borrow_tracker::RetagFields;
 use rustc_middle::ty::{
     self,
     layout::{LayoutCx, LayoutOf},

src/lib.rs

@@ -84,8 +84,8 @@ pub use crate::shims::time::EvalContextExt as _;
 pub use crate::shims::tls::{EvalContextExt as _, TlsData};
 pub use crate::shims::EvalContextExt as _;
 
-pub use crate::borrow_tracker::{
-    stacked::{EvalContextExt as StackedBorEvalContextExt, Item, Permission, Stack, Stacks},
+pub use crate::borrow_tracker::stacked::{
+    EvalContextExt as StackedBorEvalContextExt, Item, Permission, Stack, Stacks,
 };
 pub use crate::borrow_tracker::{BorTag, CallId, Method as BorrowTrackerMethod, RetagFields};
 pub use crate::clock::{Clock, Instant};

src/tag_gc.rs

@@ -171,12 +171,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: MiriInterpCxExt<'mir, 'tcx> {
         let this = self.eval_context_mut();
         this.memory.alloc_map().iter(|it| {
             for (_id, (_kind, alloc)) in it {
-                alloc
-                    .extra
-                    .borrow_tracker
-                    .as_ref()
-                    .unwrap()
-                    .remove_unreachable_tags(&tags);
+                alloc.extra.borrow_tracker.as_ref().unwrap().remove_unreachable_tags(&tags);
             }
         });
     }