fix unclear_local_imports in Miri

RalfJung · RalfJung · commit bbfdd062a440 · 2024-05-28T21:44:03.000+02:00
diff --git a/src/tools/miri/src/borrow_tracker/stacked_borrows/mod.rs b/src/tools/miri/src/borrow_tracker/stacked_borrows/mod.rs
@@ -21,9 +21,9 @@ use crate::borrow_tracker::{
 use crate::concurrency::data_race::{NaReadType, NaWriteType};
 use crate::*;
 
-use diagnostics::{RetagCause, RetagInfo};
-pub use item::{Item, Permission};
-pub use stack::Stack;
+use self::diagnostics::{RetagCause, RetagInfo};
+pub use self::item::{Item, Permission};
+pub use self::stack::Stack;
 
 pub type AllocState = Stacks;
 
diff --git a/src/tools/miri/src/borrow_tracker/tree_borrows/diagnostics.rs b/src/tools/miri/src/borrow_tracker/tree_borrows/diagnostics.rs
@@ -297,7 +297,7 @@ pub(super) struct TbError<'node> {
 impl TbError<'_> {
     /// Produce a UB error.
     pub fn build<'tcx>(self) -> InterpError<'tcx> {
-        use TransitionError::*;
+        use self::TransitionError::*;
         let cause = self.access_cause;
         let accessed = self.accessed_info;
         let conflicting = self.conflicting_info;
diff --git a/src/tools/miri/src/borrow_tracker/tree_borrows/exhaustive.rs b/src/tools/miri/src/borrow_tracker/tree_borrows/exhaustive.rs
@@ -14,6 +14,7 @@ macro_rules! precondition {
         }
     };
 }
+#[cfg_attr(not(bootstrap), allow(unclear_local_imports))]
 pub(crate) use precondition;
 
 // Trivial impls of `Exhaustive` for the standard types with 0, 1 and 2 elements respectively.
diff --git a/src/tools/miri/src/borrow_tracker/tree_borrows/mod.rs b/src/tools/miri/src/borrow_tracker/tree_borrows/mod.rs
@@ -23,8 +23,8 @@ mod unimap;
 #[cfg(test)]
 mod exhaustive;
 
-use perms::Permission;
-pub use tree::Tree;
+use self::perms::Permission;
+pub use self::tree::Tree;
 
 pub type AllocState = Tree;
 
diff --git a/src/tools/miri/src/borrow_tracker/tree_borrows/perms.rs b/src/tools/miri/src/borrow_tracker/tree_borrows/perms.rs
@@ -36,7 +36,7 @@ enum PermissionPriv {
     /// rejects: all child accesses (UB).
     Disabled,
 }
-use PermissionPriv::*;
+use self::PermissionPriv::*;
 
 impl PartialOrd for PermissionPriv {
     /// PermissionPriv is ordered by the reflexive transitive closure of
@@ -483,14 +483,14 @@ mod propagation_optimization_checks {
 
     impl Exhaustive for AccessKind {
         fn exhaustive() -> Box<dyn Iterator<Item = Self>> {
-            use AccessKind::*;
+            use self::AccessKind::*;
             Box::new(vec![Read, Write].into_iter())
         }
     }
 
     impl Exhaustive for AccessRelatedness {
         fn exhaustive() -> Box<dyn Iterator<Item = Self>> {
-            use AccessRelatedness::*;
+            use self::AccessRelatedness::*;
             Box::new(vec![This, StrictChildAccess, AncestorAccess, DistantAccess].into_iter())
         }
     }
@@ -499,7 +499,7 @@ mod propagation_optimization_checks {
     // For any kind of access, if we do it twice the second should be a no-op.
     // Even if the protector has disappeared.
     fn all_transitions_idempotent() {
-        use transition::*;
+        use self::transition::*;
         for old in PermissionPriv::exhaustive() {
             for (old_protected, new_protected) in <(bool, bool)>::exhaustive() {
                 // Protector can't appear out of nowhere: either the permission was
@@ -525,7 +525,7 @@ mod propagation_optimization_checks {
     #[test]
     #[rustfmt::skip]
     fn foreign_read_is_noop_after_foreign_write() {
-        use transition::*;
+        use self::transition::*;
         let old_access = AccessKind::Write;
         let new_access = AccessKind::Read;
         for old in PermissionPriv::exhaustive() {
diff --git a/src/tools/miri/src/borrow_tracker/tree_borrows/tree.rs b/src/tools/miri/src/borrow_tracker/tree_borrows/tree.rs
@@ -793,7 +793,7 @@ impl AccessRelatedness {
     /// for the child node. This function assumes that we propagate away from the initial
     /// access.
     pub fn for_child(self) -> Self {
-        use AccessRelatedness::*;
+        use self::AccessRelatedness::*;
         match self {
             AncestorAccess | This => AncestorAccess,
             StrictChildAccess | DistantAccess => DistantAccess,
diff --git a/src/tools/miri/src/borrow_tracker/tree_borrows/tree/tests.rs b/src/tools/miri/src/borrow_tracker/tree_borrows/tree/tests.rs
@@ -135,7 +135,7 @@ mod spurious_read {
 
     impl Exhaustive for PtrSelector {
         fn exhaustive() -> Box<dyn Iterator<Item = Self>> {
-            use PtrSelector::*;
+            use self::PtrSelector::*;
             Box::new(vec![X, Y, Other].into_iter())
         }
     }
@@ -152,7 +152,7 @@ mod spurious_read {
 
     impl Exhaustive for RelPosXY {
         fn exhaustive() -> Box<dyn Iterator<Item = Self>> {
-            use RelPosXY::*;
+            use self::RelPosXY::*;
             Box::new(vec![MutuallyForeign, XChildY].into_iter())
         }
     }
@@ -178,7 +178,7 @@ mod spurious_read {
         /// or an `AncestorAccess` relative to `y`, but it doesn't really matter
         /// because `DistantAccess.is_foreign() == AncestorAccess.is_foreign()`).
         fn rel_pair(self, xy_rel: RelPosXY) -> (AccessRelatedness, AccessRelatedness) {
-            use AccessRelatedness::*;
+            use self::AccessRelatedness::*;
             match xy_rel {
                 RelPosXY::MutuallyForeign =>
                     match self {
diff --git a/src/tools/miri/src/concurrency/data_race.rs b/src/tools/miri/src/concurrency/data_race.rs
@@ -1266,7 +1266,7 @@ trait EvalContextPrivExt<'tcx>: MiriInterpCxExt<'tcx> {
         place: &MPlaceTy<'tcx, Provenance>,
         atomic: AtomicRwOrd,
     ) -> InterpResult<'tcx> {
-        use AtomicRwOrd::*;
+        use self::AtomicRwOrd::*;
         let acquire = matches!(atomic, Acquire | AcqRel | SeqCst);
         let release = matches!(atomic, Release | AcqRel | SeqCst);
         let this = self.eval_context_mut();
diff --git a/src/tools/miri/src/concurrency/mod.rs b/src/tools/miri/src/concurrency/mod.rs
@@ -7,4 +7,4 @@ pub mod thread;
 mod vector_clock;
 pub mod weak_memory;
 
-pub use vector_clock::VClock;
+pub use self::vector_clock::VClock;
diff --git a/src/tools/miri/src/diagnostics.rs b/src/tools/miri/src/diagnostics.rs
@@ -59,7 +59,7 @@ pub struct RacingOp {
 
 impl fmt::Display for TerminationInfo {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use TerminationInfo::*;
+        use self::TerminationInfo::*;
         match self {
             Exit { code, .. } => write!(f, "the evaluated program completed with exit code {code}"),
             Abort(msg) => write!(f, "{msg}"),
@@ -212,7 +212,7 @@ pub fn report_error<'tcx>(
 
     let (title, helps) = if let MachineStop(info) = e.kind() {
         let info = info.downcast_ref::<TerminationInfo>().expect("invalid MachineStop payload");
-        use TerminationInfo::*;
+        use self::TerminationInfo::*;
         let title = match info {
             Exit { code, leak_check } => return Some((*code, *leak_check)),
             Abort(_) => Some("abnormal termination"),
@@ -579,7 +579,7 @@ pub fn report_msg<'tcx>(
 
 impl<'tcx> MiriMachine<'tcx> {
     pub fn emit_diagnostic(&self, e: NonHaltingDiagnostic) {
-        use NonHaltingDiagnostic::*;
+        use self::NonHaltingDiagnostic::*;
 
         let stacktrace = Frame::generate_stacktrace_from_stack(self.threads.active_thread_stack());
         let (stacktrace, _was_pruned) = prune_stacktrace(stacktrace, self);
diff --git a/src/tools/miri/src/eval.rs b/src/tools/miri/src/eval.rs
@@ -216,7 +216,7 @@ impl<'tcx> MainThreadState<'tcx> {
         &mut self,
         this: &mut MiriInterpCx<'tcx>,
     ) -> InterpResult<'tcx, Poll<()>> {
-        use MainThreadState::*;
+        use self::MainThreadState::*;
         match self {
             Running => {
                 *self = TlsDtors(Default::default());
diff --git a/src/tools/miri/src/intrinsics/atomic.rs b/src/tools/miri/src/intrinsics/atomic.rs
@@ -1,7 +1,7 @@
 use rustc_middle::{mir, mir::BinOp, ty};
 
 use crate::*;
-use helpers::check_arg_count;
+use self::helpers::check_arg_count;
 
 pub enum AtomicOp {
     /// The `bool` indicates whether the result of the operation should be negated (`UnOp::Not`,
diff --git a/src/tools/miri/src/intrinsics/mod.rs b/src/tools/miri/src/intrinsics/mod.rs
@@ -14,9 +14,9 @@ use rustc_span::{sym, Symbol};
 use rustc_target::abi::Size;
 
 use crate::*;
-use atomic::EvalContextExt as _;
-use helpers::{check_arg_count, ToHost, ToSoft};
-use simd::EvalContextExt as _;
+use self::atomic::EvalContextExt as _;
+use self::helpers::{check_arg_count, ToHost, ToSoft};
+use self::simd::EvalContextExt as _;
 
 impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
 pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs
@@ -48,6 +48,7 @@
     clippy::cast_lossless,
     clippy::cast_possible_truncation,
 )]
+#![cfg_attr(not(bootstrap), warn(unclear_local_imports))]
 // Needed for rustdoc from bootstrap (with `-Znormalize-docs`).
 #![recursion_limit = "256"]
 
diff --git a/src/tools/miri/src/shims/env.rs b/src/tools/miri/src/shims/env.rs
@@ -3,7 +3,7 @@ use std::ffi::{OsStr, OsString};
 use rustc_data_structures::fx::FxHashMap;
 
 use crate::*;
-use shims::{unix::UnixEnvVars, windows::WindowsEnvVars};
+use self::shims::{unix::UnixEnvVars, windows::WindowsEnvVars};
 
 #[derive(Default)]
 pub enum EnvVars<'tcx> {
diff --git a/src/tools/miri/src/shims/foreign_items.rs b/src/tools/miri/src/shims/foreign_items.rs
@@ -15,7 +15,7 @@ use rustc_target::{
 use super::alloc::{check_alloc_request, EvalContextExt as _};
 use super::backtrace::EvalContextExt as _;
 use crate::*;
-use helpers::{ToHost, ToSoft};
+use self::helpers::{ToHost, ToSoft};
 
 /// Type of dynamic symbols (for `dlsym` et al)
 #[derive(Debug, Copy, Clone)]
diff --git a/src/tools/miri/src/shims/mod.rs b/src/tools/miri/src/shims/mod.rs
@@ -17,7 +17,7 @@ pub mod panic;
 pub mod time;
 pub mod tls;
 
-pub use unix::{DirTable, FdTable};
+pub use self::unix::{DirTable, FdTable};
 
 /// What needs to be done after emulating an item (a shim or an intrinsic) is done.
 pub enum EmulateItemResult {
diff --git a/src/tools/miri/src/shims/panic.rs b/src/tools/miri/src/shims/panic.rs
@@ -17,7 +17,7 @@ use rustc_target::spec::abi::Abi;
 use rustc_target::spec::PanicStrategy;
 
 use crate::*;
-use helpers::check_arg_count;
+use self::helpers::check_arg_count;
 
 /// Holds all of the relevant data for when unwinding hits a `try` frame.
 #[derive(Debug)]
diff --git a/src/tools/miri/src/shims/tls.rs b/src/tools/miri/src/shims/tls.rs
@@ -237,7 +237,7 @@ impl<'tcx> TlsDtorsState<'tcx> {
         &mut self,
         this: &mut MiriInterpCx<'tcx>,
     ) -> InterpResult<'tcx, Poll<()>> {
-        use TlsDtorsStatePriv::*;
+        use self::TlsDtorsStatePriv::*;
         let new_state = 'new_state: {
             match &mut self.0 {
                 Init => {
diff --git a/src/tools/miri/src/shims/unix/foreign_items.rs b/src/tools/miri/src/shims/unix/foreign_items.rs
@@ -9,11 +9,11 @@ use crate::shims::alloc::EvalContextExt as _;
 use crate::shims::unix::*;
 use crate::*;
 
-use shims::unix::android::foreign_items as android;
-use shims::unix::freebsd::foreign_items as freebsd;
-use shims::unix::linux::foreign_items as linux;
-use shims::unix::macos::foreign_items as macos;
-use shims::unix::solarish::foreign_items as solarish;
+use self::shims::unix::android::foreign_items as android;
+use self::shims::unix::freebsd::foreign_items as freebsd;
+use self::shims::unix::linux::foreign_items as linux;
+use self::shims::unix::macos::foreign_items as macos;
+use self::shims::unix::solarish::foreign_items as solarish;
 
 pub fn is_dyn_sym(name: &str, target_os: &str) -> bool {
     match name {
diff --git a/src/tools/miri/src/shims/unix/fs.rs b/src/tools/miri/src/shims/unix/fs.rs
@@ -14,7 +14,7 @@ use rustc_target::abi::Size;
 use crate::shims::os_str::bytes_to_os_str;
 use crate::shims::unix::*;
 use crate::*;
-use shims::time::system_time_to_duration;
+use self::shims::time::system_time_to_duration;
 
 use self::fd::FileDescriptor;
 
diff --git a/src/tools/miri/src/shims/unix/linux/foreign_items.rs b/src/tools/miri/src/shims/unix/linux/foreign_items.rs
@@ -5,10 +5,10 @@ use crate::machine::SIGRTMAX;
 use crate::machine::SIGRTMIN;
 use crate::shims::unix::*;
 use crate::*;
-use shims::unix::linux::epoll::EvalContextExt as _;
-use shims::unix::linux::eventfd::EvalContextExt as _;
-use shims::unix::linux::mem::EvalContextExt as _;
-use shims::unix::linux::sync::futex;
+use self::shims::unix::linux::epoll::EvalContextExt as _;
+use self::shims::unix::linux::eventfd::EvalContextExt as _;
+use self::shims::unix::linux::mem::EvalContextExt as _;
+use self::shims::unix::linux::sync::futex;
 
 pub fn is_dyn_sym(name: &str) -> bool {
     matches!(name, "statx")
diff --git a/src/tools/miri/src/shims/unix/mod.rs b/src/tools/miri/src/shims/unix/mod.rs
@@ -14,17 +14,17 @@ mod linux;
 mod macos;
 mod solarish;
 
-pub use env::UnixEnvVars;
-pub use fd::{FdTable, FileDescription};
-pub use fs::DirTable;
+pub use self::env::UnixEnvVars;
+pub use self::fd::{FdTable, FileDescription};
+pub use self::fs::DirTable;
 // All the Unix-specific extension traits
-pub use env::EvalContextExt as _;
-pub use fd::EvalContextExt as _;
-pub use fs::EvalContextExt as _;
-pub use mem::EvalContextExt as _;
-pub use socket::EvalContextExt as _;
-pub use sync::EvalContextExt as _;
-pub use thread::EvalContextExt as _;
+pub use self::env::EvalContextExt as _;
+pub use self::fd::EvalContextExt as _;
+pub use self::fs::EvalContextExt as _;
+pub use self::mem::EvalContextExt as _;
+pub use self::socket::EvalContextExt as _;
+pub use self::sync::EvalContextExt as _;
+pub use self::thread::EvalContextExt as _;
 
 // Make up some constants.
 const UID: u32 = 1000;
diff --git a/src/tools/miri/src/shims/windows/env.rs b/src/tools/miri/src/shims/windows/env.rs
@@ -5,7 +5,7 @@ use std::io::ErrorKind;
 use rustc_data_structures::fx::FxHashMap;
 
 use crate::*;
-use helpers::windows_check_buffer_size;
+use self::helpers::windows_check_buffer_size;
 
 #[derive(Default)]
 pub struct WindowsEnvVars {
diff --git a/src/tools/miri/src/shims/windows/foreign_items.rs b/src/tools/miri/src/shims/windows/foreign_items.rs
@@ -11,7 +11,7 @@ use rustc_target::spec::abi::Abi;
 use crate::shims::os_str::bytes_to_os_str;
 use crate::shims::windows::*;
 use crate::*;
-use shims::windows::handle::{Handle, PseudoHandle};
+use self::shims::windows::handle::{Handle, PseudoHandle};
 
 pub fn is_dyn_sym(name: &str) -> bool {
     // std does dynamic detection for these symbols
diff --git a/src/tools/miri/src/shims/windows/mod.rs b/src/tools/miri/src/shims/windows/mod.rs
@@ -5,9 +5,9 @@ mod handle;
 mod sync;
 mod thread;
 
-pub use env::WindowsEnvVars;
+pub use self::env::WindowsEnvVars;
 // All the Windows-specific extension traits
-pub use env::EvalContextExt as _;
-pub use handle::EvalContextExt as _;
-pub use sync::EvalContextExt as _;
-pub use thread::EvalContextExt as _;
+pub use self::env::EvalContextExt as _;
+pub use self::handle::EvalContextExt as _;
+pub use self::sync::EvalContextExt as _;
+pub use self::thread::EvalContextExt as _;
diff --git a/src/tools/miri/src/shims/windows/thread.rs b/src/tools/miri/src/shims/windows/thread.rs
@@ -2,7 +2,7 @@ use rustc_middle::ty::layout::LayoutOf;
 use rustc_target::spec::abi::Abi;
 
 use crate::*;
-use shims::windows::handle::{EvalContextExt as _, Handle, PseudoHandle};
+use self::shims::windows::handle::{EvalContextExt as _, Handle, PseudoHandle};
 
 impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
 
diff --git a/src/tools/miri/src/shims/x86/mod.rs b/src/tools/miri/src/shims/x86/mod.rs
@@ -9,7 +9,7 @@ use rustc_target::abi::Size;
 use rustc_target::spec::abi::Abi;
 
 use crate::*;
-use helpers::bool_to_simd_element;
+use self::helpers::bool_to_simd_element;
 
 mod aesni;
 mod avx;

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ macro_rules! precondition {`
`14`	`14`	`}`
`15`	`15`	`};`
`16`	`16`	`}`
	`17`	`+#[cfg_attr(not(bootstrap), allow(unclear_local_imports))]`
`17`	`18`	`pub(crate) use precondition;`
`18`	`19`
`19`	`20`	// Trivial impls of `Exhaustive` for the standard types with 0, 1 and 2 elements respectively.
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ mod spurious_read {`
`135`	`135`
`136`	`136`	`impl Exhaustive for PtrSelector {`
`137`	`137`	`fn exhaustive() -> Box<dyn Iterator<Item = Self>> {`
`138`		`- use PtrSelector::*;`
	`138`	`+ use self::PtrSelector::*;`
`139`	`139`	`Box::new(vec![X, Y, Other].into_iter())`
`140`	`140`	`}`
`141`	`141`	`}`
`@@ -152,7 +152,7 @@ mod spurious_read {`
`152`	`152`
`153`	`153`	`impl Exhaustive for RelPosXY {`
`154`	`154`	`fn exhaustive() -> Box<dyn Iterator<Item = Self>> {`
`155`		`- use RelPosXY::*;`
	`155`	`+ use self::RelPosXY::*;`
`156`	`156`	`Box::new(vec![MutuallyForeign, XChildY].into_iter())`
`157`	`157`	`}`
`158`	`158`	`}`
`@@ -178,7 +178,7 @@ mod spurious_read {`
`178`	`178`	/// or an `AncestorAccess` relative to `y`, but it doesn't really matter
`179`	`179`	/// because `DistantAccess.is_foreign() == AncestorAccess.is_foreign()`).
`180`	`180`	`fn rel_pair(self, xy_rel: RelPosXY) -> (AccessRelatedness, AccessRelatedness) {`
`181`		`- use AccessRelatedness::*;`
	`181`	`+ use self::AccessRelatedness::*;`
`182`	`182`	`match xy_rel {`
`183`	`183`	`RelPosXY::MutuallyForeign =>`
`184`	`184`	`match self {`