fix(upstream): rustc_middle::mono is now not under mir

Author: nbdd0121

flake.lock

@@ -4,7 +4,7 @@
 
 use rustc_hir::def_id::LocalDefId;
 use rustc_lint::{LateContext, LateLintPass};
-use rustc_middle::mir::mono::MonoItem;
+use rustc_middle::mono::MonoItem;
 use rustc_middle::ty::{GenericArgs, Instance, TyCtxt, TypingEnv};
 use rustc_session::{declare_tool_lint, impl_lint_pass};
 use rustc_span::Span;

src/atomic_context.rs

@@ -1,5 +1,5 @@
 use object::{File, Object, ObjectSection, ObjectSymbol, RelocationTarget};
-use rustc_middle::mir::mono::MonoItem;
+use rustc_middle::mono::MonoItem;
 use rustc_middle::ty::{Instance, TypingEnv};
 use rustc_span::Span;
 

src/binary_analysis/build_error.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::LangItem;
-use rustc_middle::mir::mono::MonoItem;
+use rustc_middle::mono::MonoItem;
 use rustc_middle::ty::{Instance, TyCtxt};
 use rustc_middle::{mir, ty};
 use rustc_span::{BytePos, DUMMY_SP, FileName, RemapPathScopeComponents, Span};

src/binary_analysis/reconstruct.rs

@@ -3,7 +3,7 @@ use object::{Architecture, File, Object, ObjectSection, SectionKind};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::{Diag, Diagnostic, Level};
 use rustc_hir::CRATE_HIR_ID;
-use rustc_middle::mir::mono::MonoItem;
+use rustc_middle::mono::MonoItem;
 use rustc_middle::ty::Instance;
 use rustc_session::declare_tool_lint;
 use rustc_span::{Span, Symbol, sym};

src/binary_analysis/stack_size.rs

@@ -317,7 +317,8 @@ impl<'tcx> AnalysisCtxt<'tcx> {
         // compilations can observe unwritten metadata.
         //
         // If we move away from sqlite in the future, take a manual flock instead.
-        conn.pragma_update(None, "locking_mode", "EXCLUSIVE").unwrap();
+        conn.pragma_update(None, "locking_mode", "EXCLUSIVE")
+            .unwrap();
 
         conn.execute("begin exclusive", ()).unwrap();
         conn.pragma_update(None, "user_version", SCHEMA_VERSION)

src/ctxt.rs

@@ -5,7 +5,7 @@
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::{Diag, DiagCtxtHandle, Diagnostic, Level};
 use rustc_lint::{LateContext, LateLintPass, LintContext};
-use rustc_middle::mir::mono::MonoItem;
+use rustc_middle::mono::MonoItem;
 use rustc_middle::ty::Instance;
 use rustc_session::{declare_lint_pass, declare_tool_lint};
 use rustc_span::{Spanned, sym};

src/infallible_allocation.rs

@@ -21,9 +21,9 @@ use rustc_hir::limit::Limit;
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::mir::interpret::AllocId;
 use rustc_middle::mir::interpret::{ErrorHandled, GlobalAlloc, Scalar};
-use rustc_middle::mir::mono::{CollectionMode, MonoItem};
 use rustc_middle::mir::visit::Visitor as MirVisitor;
 use rustc_middle::mir::{self, Location, MentionedItem, traversal};
+use rustc_middle::mono::{CollectionMode, MonoItem};
 use rustc_middle::query::TyCtxtAt;
 use rustc_middle::ty::adjustment::{CustomCoerceUnsized, PointerCoercion};
 use rustc_middle::ty::layout::ValidityRequirement;
@@ -405,11 +405,9 @@ fn collect_items_rec<'tcx>(
     {
         let mut visited = OnceCell::default();
         if mode == CollectionMode::UsedItems {
-            used_items.items.retain(|k, _| {
-                visited
-                    .get_mut_or_init(|| state.visited.lock())
-                    .insert(*k)
-            });
+            used_items
+                .items
+                .retain(|k, _| visited.get_mut_or_init(|| state.visited.lock()).insert(*k));
         }
 
         let mut mentioned = OnceCell::default();