fix unqualified_local_imports in Miri

Author: RalfJung

src/tools/miri/src/borrow_tracker/stacked_borrows/mod.rs

@@ -22,9 +22,9 @@ use crate::borrow_tracker::{
 usecrate::concurrency::data_race::{NaReadType,NaWriteType};
 usecrate::*;
 
-use diagnostics::{RetagCause,RetagInfo};
-pubuse item::{Item,Permission};
-pubuse stack::Stack;
+useself::diagnostics::{RetagCause,RetagInfo};
+pubuseself::item::{Item,Permission};
+pubuseself::stack::Stack;
 
 pubtypeAllocState = Stacks;
 

src/tools/miri/src/borrow_tracker/tree_borrows/mod.rs

@@ -19,8 +19,8 @@ mod unimap;
 #[cfg(test)]
 mod exhaustive;
 
-use perms::Permission;
-pubuse tree::Tree;
+useself::perms::Permission;
+pubuseself::tree::Tree;
 
 pubtypeAllocState = Tree;
 

src/tools/miri/src/borrow_tracker/tree_borrows/perms.rs

@@ -47,7 +47,7 @@ enum PermissionPriv {
 /// rejects: all child accesses (UB).
 Disabled,
 }
-usePermissionPriv::*;
+useself::PermissionPriv::*;
 
 implPartialOrdforPermissionPriv{
 /// PermissionPriv is ordered by the reflexive transitive closure of

src/tools/miri/src/concurrency/mod.rs

@@ -7,4 +7,4 @@ pub mod thread;
 mod vector_clock;
 pubmod weak_memory;
 
-pubuse vector_clock::VClock;
+pubuseself::vector_clock::VClock;

src/tools/miri/src/intrinsics/atomic.rs

@@ -1,7 +1,7 @@
 use rustc_middle::{mir, mir::BinOp, ty};
 
 usecrate::*;
-use helpers::check_arg_count;
+useself::helpers::check_arg_count;
 
 pubenumAtomicOp{
 /// The `bool` indicates whether the result of the operation should be negated (`UnOp::Not`,

src/tools/miri/src/intrinsics/mod.rs

@@ -13,9 +13,9 @@ use rustc_span::{Symbol, sym};
 use rustc_target::abi::Size;
 
 usecrate::*;
-use atomic::EvalContextExtas _;
-use helpers::{ToHost,ToSoft, check_arg_count};
-use simd::EvalContextExtas _;
+useself::atomic::EvalContextExtas _;
+useself::helpers::{ToHost,ToSoft, check_arg_count};
+useself::simd::EvalContextExtas _;
 
 impl<'tcx>EvalContextExt<'tcx>forcrate::MiriInterpCx<'tcx>{}
 pubtraitEvalContextExt<'tcx>:crate::MiriInterpCxExt<'tcx>{

src/tools/miri/src/lib.rs

@@ -51,6 +51,8 @@
  clippy::cast_lossless,
  clippy::cast_possible_truncation,
 )]
+#![cfg_attr(not(bootstrap), feature(unqualified_local_imports))]
+#![cfg_attr(not(bootstrap), warn(unqualified_local_imports))]
 // Needed for rustdoc from bootstrap (with `-Znormalize-docs`).
 #![recursion_limit = "256"]
 

src/tools/miri/src/shims/env.rs

@@ -3,7 +3,7 @@ use std::ffi::{OsStr, OsString};
 use rustc_data_structures::fx::FxHashMap;
 
 usecrate::*;
-use shims::{unix::UnixEnvVars, windows::WindowsEnvVars};
+useself::shims::{unix::UnixEnvVars, windows::WindowsEnvVars};
 
 #[derive(Default)]
 pubenumEnvVars<'tcx>{

src/tools/miri/src/shims/foreign_items.rs

@@ -15,7 +15,7 @@ use rustc_target::{
 usesuper::alloc::EvalContextExtas _;
 usesuper::backtrace::EvalContextExtas _;
 usecrate::*;
-use helpers::{ToHost,ToSoft};
+useself::helpers::{ToHost,ToSoft};
 
 /// Type of dynamic symbols (for `dlsym` et al)
 #[derive(Debug,Copy,Clone)]

src/tools/miri/src/shims/mod.rs

@@ -17,7 +17,7 @@ pub mod panic;
 pubmod time;
 pubmod tls;
 
-pubuse unix::{DirTable,EpollInterestTable,FdTable};
+pubuseself::unix::{DirTable,EpollInterestTable,FdTable};
 
 /// What needs to be done after emulating an item (a shim or an intrinsic) is done.
 pubenumEmulateItemResult{