mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup global imports a bit

Browse Source
This commit is contained in:
Ralf Jung 2022-11-27 12:22:14 +01:00
parent a0d104d5f7
commit 0849084d06
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/miri/src/lib.rs
View File

@ -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};

8
src/tools/miri/src/machine.rs
View File

@ -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(

4
src/tools/miri/src/stacked_borrows/diagnostics.rs
View File

@ -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;