diff options
| -rw-r--r-- | src/tools/miri/src/lib.rs | 5 | ||||
| -rw-r--r-- | src/tools/miri/src/machine.rs | 8 | ||||
| -rw-r--r-- | src/tools/miri/src/stacked_borrows/diagnostics.rs | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs index 13a8874272a..a759a81b773 100644 --- a/src/tools/miri/src/lib.rs +++ b/src/tools/miri/src/lib.rs @@ -90,8 +90,7 @@ pub use crate::concurrency::{ init_once::{EvalContextExt as _, InitOnceId}, sync::{CondvarId, EvalContextExt as _, MutexId, RwLockId, SyncId}, thread::{ - EvalContextExt as _, SchedulingAction, StackEmptyCallback, ThreadId, ThreadManager, - ThreadState, Time, + EvalContextExt as _, SchedulingAction, StackEmptyCallback, ThreadId, ThreadManager, Time, }, }; pub use crate::diagnostics::{ @@ -110,7 +109,7 @@ pub use crate::mono_hash_map::MonoHashMap; pub use crate::operator::EvalContextExt as _; pub use crate::range_map::RangeMap; pub use crate::stacked_borrows::{ - CallId, EvalContextExt as _, Item, Permission, RetagFields, SbTag, Stack, Stacks, + CallId, EvalContextExt as _, Item, Permission, RetagFields, SbTag, }; pub use crate::tag_gc::{EvalContextExt as _, VisitTags}; diff --git a/src/tools/miri/src/machine.rs b/src/tools/miri/src/machine.rs index df1b5064a9c..4d3444bc39c 100644 --- a/src/tools/miri/src/machine.rs +++ b/src/tools/miri/src/machine.rs @@ -908,7 +908,13 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> { let alloc = alloc.into_owned(); let stacks = ecx.machine.stacked_borrows.as_ref().map(|stacked_borrows| { - Stacks::new_allocation(id, alloc.size(), stacked_borrows, kind, &ecx.machine) + stacked_borrows::Stacks::new_allocation( + id, + alloc.size(), + stacked_borrows, + kind, + &ecx.machine, + ) }); let race_alloc = ecx.machine.data_race.as_ref().map(|data_race| { data_race::AllocExtra::new_allocation( diff --git a/src/tools/miri/src/stacked_borrows/diagnostics.rs b/src/tools/miri/src/stacked_borrows/diagnostics.rs index 9970b79f8c7..023f6005419 100644 --- a/src/tools/miri/src/stacked_borrows/diagnostics.rs +++ b/src/tools/miri/src/stacked_borrows/diagnostics.rs @@ -5,7 +5,9 @@ use rustc_middle::mir::interpret::{alloc_range, AllocId, AllocRange}; use rustc_span::{Span, SpanData}; use rustc_target::abi::Size; -use crate::stacked_borrows::{err_sb_ub, AccessKind, GlobalStateInner, Permission, ProtectorKind}; +use crate::stacked_borrows::{ + err_sb_ub, AccessKind, GlobalStateInner, Permission, ProtectorKind, Stack, +}; use crate::*; use rustc_middle::mir::interpret::InterpError; |