diff --git a/compiler/rustc_hir_typeck/src/pat.rs b/compiler/rustc_hir_typeck/src/pat.rs
index 90e22b2cd381a..b56ab6dcb4ab2 100644
--- a/compiler/rustc_hir_typeck/src/pat.rs
+++ b/compiler/rustc_hir_typeck/src/pat.rs
@@ -1512,11 +1512,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         pat_info: PatInfo<'tcx>,
     ) -> Ty<'tcx> {
         // Type-check the path.
-        let _ = self.demand_eqtype_pat(pat.span, expected, pat_ty, &pat_info.top_info);
+        let had_err = self.demand_eqtype_pat(pat.span, expected, pat_ty, &pat_info.top_info);
 
         // Type-check subpatterns.
         match self.check_struct_pat_fields(pat_ty, pat, variant, fields, has_rest_pat, pat_info) {
-            Ok(()) => pat_ty,
+            Ok(()) => match had_err {
+                Ok(()) => pat_ty,
+                Err(guar) => Ty::new_error(self.tcx, guar),
+            },
             Err(guar) => Ty::new_error(self.tcx, guar),
         }
     }
@@ -1764,8 +1767,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         };
 
         // Type-check the tuple struct pattern against the expected type.
-        let diag = self.demand_eqtype_pat_diag(pat.span, expected, pat_ty, &pat_info.top_info);
-        let had_err = diag.map_err(|diag| diag.emit());
+        let had_err = self.demand_eqtype_pat(pat.span, expected, pat_ty, &pat_info.top_info);
 
         // Type-check subpatterns.
         if subpats.len() == variant.fields.len()
@@ -1989,11 +1991,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         if let Err(reported) = self.demand_eqtype_pat(span, expected, pat_ty, &pat_info.top_info) {
             // Walk subpatterns with an expected type of `err` in this case to silence
             // further errors being emitted when using the bindings. #50333
-            let element_tys_iter = (0..max_len).map(|_| Ty::new_error(tcx, reported));
             for (_, elem) in elements.iter().enumerate_and_adjust(max_len, ddpos) {
                 self.check_pat(elem, Ty::new_error(tcx, reported), pat_info);
             }
-            Ty::new_tup_from_iter(tcx, element_tys_iter)
+            Ty::new_error(tcx, reported)
         } else {
             for (i, elem) in elements.iter().enumerate_and_adjust(max_len, ddpos) {
                 self.check_pat(elem, element_tys[i], pat_info);
diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs
index 4230aa7568e25..c165b91cc9163 100644
--- a/compiler/rustc_lint_defs/src/builtin.rs
+++ b/compiler/rustc_lint_defs/src/builtin.rs
@@ -4465,7 +4465,7 @@ declare_lint! {
     ///
     /// [future-incompatible]: ../index.md#future-incompatible-lints
     pub AMBIGUOUS_GLOB_IMPORTS,
-    Deny,
+    Warn,
     "detects certain glob imports that require reporting an ambiguity error",
     @future_incompatible = FutureIncompatibleInfo {
         reason: fcw!(FutureReleaseError #114095),
diff --git a/compiler/rustc_middle/src/mir/syntax.rs b/compiler/rustc_middle/src/mir/syntax.rs
index 83e9a1f1784b5..6ec874fb15f71 100644
--- a/compiler/rustc_middle/src/mir/syntax.rs
+++ b/compiler/rustc_middle/src/mir/syntax.rs
@@ -1221,25 +1221,32 @@ pub enum ProjectionElem<V, T> {
     /// thing is true of the `ConstantIndex` and `Subslice` projections below.
     Index(V),
 
-    /// These indices are generated by slice patterns. Easiest to explain
-    /// by example:
+    /// These endpoint-relative indices are generated by slice/array patterns.
+    ///
+    /// For array types, `offset` is always relative to the start of the array.
+    /// For slice types, `from_end` determines whether `offset` is relative to
+    /// the start or the end of the slice being inspected.
+    ///
+    /// Slice-pattern indices are easiest to explain by the position of `X` in
+    /// these examples:
     ///
     /// ```ignore (illustrative)
-    /// [X, _, .._, _, _] => { offset: 0, min_length: 4, from_end: false },
-    /// [_, X, .._, _, _] => { offset: 1, min_length: 4, from_end: false },
-    /// [_, _, .._, X, _] => { offset: 2, min_length: 4, from_end: true },
-    /// [_, _, .._, _, X] => { offset: 1, min_length: 4, from_end: true },
+    /// [X, _, .., _, _] => { offset: 0, min_length: 4, from_end: false },
+    /// [_, X, .., _, _] => { offset: 1, min_length: 4, from_end: false },
+    /// [_, _, .., X, _] => { offset: 2, min_length: 4, from_end: true },
+    /// [_, _, .., _, X] => { offset: 1, min_length: 4, from_end: true },
     /// ```
     ConstantIndex {
-        /// index or -index (in Python terms), depending on from_end
+        /// - If `from_end == false`, this is a 0-based offset from the start of the array/slice.
+        /// - If `from_end == true`, this is a 1-based offset from the end of the slice.
         offset: u64,
         /// The thing being indexed must be at least this long -- otherwise, the
         /// projection is UB.
         ///
         /// For arrays this is always the exact length.
         min_length: u64,
-        /// Counting backwards from end? This is always false when indexing an
-        /// array.
+        /// If `true`, `offset` is a 1-based offset from the end of the slice.
+        /// Always false when indexing an array.
         from_end: bool,
     },
 
diff --git a/compiler/rustc_middle/src/thir.rs b/compiler/rustc_middle/src/thir.rs
index e538c2182924a..dcbed92d350b7 100644
--- a/compiler/rustc_middle/src/thir.rs
+++ b/compiler/rustc_middle/src/thir.rs
@@ -116,12 +116,6 @@ pub struct Param<'tcx> {
     pub hir_id: Option<HirId>,
 }
 
-#[derive(Copy, Clone, Debug, HashStable)]
-pub enum LintLevel {
-    Inherited,
-    Explicit(HirId),
-}
-
 #[derive(Clone, Debug, HashStable)]
 pub struct Block {
     /// Whether the block itself has a label. Used by `label: {}`
@@ -236,8 +230,8 @@ pub enum StmtKind<'tcx> {
         /// `let pat: ty = <INIT> else { <ELSE> }`
         else_block: Option<BlockId>,
 
-        /// The lint level for this `let` statement.
-        lint_level: LintLevel,
+        /// The [`HirId`] for this `let` statement.
+        hir_id: HirId,
 
         /// Span of the `let <PAT> = <INIT>` part.
         span: Span,
@@ -271,7 +265,7 @@ pub enum ExprKind<'tcx> {
     /// and to track the `HirId` of the expressions within the scope.
     Scope {
         region_scope: region::Scope,
-        lint_level: LintLevel,
+        hir_id: HirId,
         value: ExprId,
     },
     /// A `box <value>` expression.
@@ -579,7 +573,7 @@ pub struct Arm<'tcx> {
     pub pattern: Box<Pat<'tcx>>,
     pub guard: Option<ExprId>,
     pub body: ExprId,
-    pub lint_level: LintLevel,
+    pub hir_id: HirId,
     pub scope: region::Scope,
     pub span: Span,
 }
diff --git a/compiler/rustc_middle/src/thir/visit.rs b/compiler/rustc_middle/src/thir/visit.rs
index b611b23e52619..c06d5c5f0ebb0 100644
--- a/compiler/rustc_middle/src/thir/visit.rs
+++ b/compiler/rustc_middle/src/thir/visit.rs
@@ -47,9 +47,7 @@ pub fn walk_expr<'thir, 'tcx: 'thir, V: Visitor<'thir, 'tcx>>(
     use ExprKind::*;
     let Expr { kind, ty: _, temp_scope_id: _, span: _ } = expr;
     match *kind {
-        Scope { value, region_scope: _, lint_level: _ } => {
-            visitor.visit_expr(&visitor.thir()[value])
-        }
+        Scope { value, region_scope: _, hir_id: _ } => visitor.visit_expr(&visitor.thir()[value]),
         Box { value } => visitor.visit_expr(&visitor.thir()[value]),
         If { cond, then, else_opt, if_then_scope: _ } => {
             visitor.visit_expr(&visitor.thir()[cond]);
@@ -205,7 +203,7 @@ pub fn walk_stmt<'thir, 'tcx: 'thir, V: Visitor<'thir, 'tcx>>(
             remainder_scope: _,
             init_scope: _,
             pattern,
-            lint_level: _,
+            hir_id: _,
             else_block,
             span: _,
         } => {
@@ -238,7 +236,7 @@ pub fn walk_arm<'thir, 'tcx: 'thir, V: Visitor<'thir, 'tcx>>(
     visitor: &mut V,
     arm: &'thir Arm<'tcx>,
 ) {
-    let Arm { guard, pattern, body, lint_level: _, span: _, scope: _ } = arm;
+    let Arm { guard, pattern, body, hir_id: _, span: _, scope: _ } = arm;
     if let Some(expr) = guard {
         visitor.visit_expr(&visitor.thir()[*expr])
     }
diff --git a/compiler/rustc_mir_build/src/builder/block.rs b/compiler/rustc_mir_build/src/builder/block.rs
index 88533ad226487..bfbb6fa7d1692 100644
--- a/compiler/rustc_mir_build/src/builder/block.rs
+++ b/compiler/rustc_mir_build/src/builder/block.rs
@@ -7,6 +7,7 @@ use tracing::debug;
 
 use crate::builder::ForGuard::OutsideGuard;
 use crate::builder::matches::{DeclareLetBindings, ScheduleDrops};
+use crate::builder::scope::LintLevel;
 use crate::builder::{BlockAnd, BlockAndExtension, BlockFrame, Builder};
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
@@ -83,7 +84,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     init_scope,
                     pattern,
                     initializer: Some(initializer),
-                    lint_level,
+                    hir_id,
                     else_block: Some(else_block),
                     span: _,
                 } => {
@@ -191,7 +192,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
 
                     let initializer_span = this.thir[*initializer].span;
                     let scope = (*init_scope, source_info);
-                    let failure_and_block = this.in_scope(scope, *lint_level, |this| {
+                    let lint_level = LintLevel::Explicit(*hir_id);
+                    let failure_and_block = this.in_scope(scope, lint_level, |this| {
                         this.declare_bindings(
                             visibility_scope,
                             remainder_span,
@@ -232,7 +234,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     init_scope,
                     pattern,
                     initializer,
-                    lint_level,
+                    hir_id,
                     else_block: None,
                     span: _,
                 } => {
@@ -250,12 +252,13 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                         Some(this.new_source_scope(remainder_span, LintLevel::Inherited));
 
                     // Evaluate the initializer, if present.
+                    let lint_level = LintLevel::Explicit(*hir_id);
                     if let Some(init) = *initializer {
                         let initializer_span = this.thir[init].span;
                         let scope = (*init_scope, source_info);
 
                         block = this
-                            .in_scope(scope, *lint_level, |this| {
+                            .in_scope(scope, lint_level, |this| {
                                 this.declare_bindings(
                                     visibility_scope,
                                     remainder_span,
@@ -269,7 +272,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                             .into_block();
                     } else {
                         let scope = (*init_scope, source_info);
-                        let _: BlockAnd<()> = this.in_scope(scope, *lint_level, |this| {
+                        let _: BlockAnd<()> = this.in_scope(scope, lint_level, |this| {
                             this.declare_bindings(
                                 visibility_scope,
                                 remainder_span,
diff --git a/compiler/rustc_mir_build/src/builder/expr/as_constant.rs b/compiler/rustc_mir_build/src/builder/expr/as_constant.rs
index 1772d66f5285a..c4bb735ef7d5c 100644
--- a/compiler/rustc_mir_build/src/builder/expr/as_constant.rs
+++ b/compiler/rustc_mir_build/src/builder/expr/as_constant.rs
@@ -23,7 +23,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let tcx = this.tcx;
         let Expr { ty, temp_scope_id: _, span, ref kind } = *expr;
         match kind {
-            ExprKind::Scope { region_scope: _, lint_level: _, value } => {
+            ExprKind::Scope { region_scope: _, hir_id: _, value } => {
                 this.as_constant(&this.thir[*value])
             }
             _ => as_constant_inner(
diff --git a/compiler/rustc_mir_build/src/builder/expr/as_operand.rs b/compiler/rustc_mir_build/src/builder/expr/as_operand.rs
index 5989a15b93462..d2f06cc9d57b3 100644
--- a/compiler/rustc_mir_build/src/builder/expr/as_operand.rs
+++ b/compiler/rustc_mir_build/src/builder/expr/as_operand.rs
@@ -6,6 +6,7 @@ use rustc_middle::thir::*;
 use tracing::{debug, instrument};
 
 use crate::builder::expr::category::Category;
+use crate::builder::scope::LintLevel;
 use crate::builder::{BlockAnd, BlockAndExtension, Builder, NeedsTemporary};
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
@@ -122,10 +123,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let this = self; // See "LET_THIS_SELF".
 
         let expr = &this.thir[expr_id];
-        if let ExprKind::Scope { region_scope, lint_level, value } = expr.kind {
+        if let ExprKind::Scope { region_scope, hir_id, value } = expr.kind {
             let source_info = this.source_info(expr.span);
             let region_scope = (region_scope, source_info);
-            return this.in_scope(region_scope, lint_level, |this| {
+            return this.in_scope(region_scope, LintLevel::Explicit(hir_id), |this| {
                 this.as_operand(block, scope, value, local_info, needs_temporary)
             });
         }
@@ -165,10 +166,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let expr = &this.thir[expr_id];
         debug!("as_call_operand(block={:?}, expr={:?})", block, expr);
 
-        if let ExprKind::Scope { region_scope, lint_level, value } = expr.kind {
+        if let ExprKind::Scope { region_scope, hir_id, value } = expr.kind {
             let source_info = this.source_info(expr.span);
             let region_scope = (region_scope, source_info);
-            return this.in_scope(region_scope, lint_level, |this| {
+            return this.in_scope(region_scope, LintLevel::Explicit(hir_id), |this| {
                 this.as_call_operand(block, scope, value)
             });
         }
diff --git a/compiler/rustc_mir_build/src/builder/expr/as_place.rs b/compiler/rustc_mir_build/src/builder/expr/as_place.rs
index cb81b42128a81..139c6da29d440 100644
--- a/compiler/rustc_mir_build/src/builder/expr/as_place.rs
+++ b/compiler/rustc_mir_build/src/builder/expr/as_place.rs
@@ -16,6 +16,7 @@ use tracing::{debug, instrument, trace};
 
 use crate::builder::ForGuard::{OutsideGuard, RefWithinGuard};
 use crate::builder::expr::category::Category;
+use crate::builder::scope::LintLevel;
 use crate::builder::{BlockAnd, BlockAndExtension, Builder, Capture, CaptureMap};
 
 /// The "outermost" place that holds this value.
@@ -427,8 +428,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let expr_span = expr.span;
         let source_info = this.source_info(expr_span);
         match expr.kind {
-            ExprKind::Scope { region_scope, lint_level, value } => {
-                this.in_scope((region_scope, source_info), lint_level, |this| {
+            ExprKind::Scope { region_scope, hir_id, value } => {
+                this.in_scope((region_scope, source_info), LintLevel::Explicit(hir_id), |this| {
                     this.expr_as_place(block, value, mutability, fake_borrow_temps)
                 })
             }
diff --git a/compiler/rustc_mir_build/src/builder/expr/as_rvalue.rs b/compiler/rustc_mir_build/src/builder/expr/as_rvalue.rs
index bb1095ced47ab..8de79ab2531f4 100644
--- a/compiler/rustc_mir_build/src/builder/expr/as_rvalue.rs
+++ b/compiler/rustc_mir_build/src/builder/expr/as_rvalue.rs
@@ -18,6 +18,7 @@ use tracing::debug;
 
 use crate::builder::expr::as_place::PlaceBase;
 use crate::builder::expr::category::{Category, RvalueFunc};
+use crate::builder::scope::LintLevel;
 use crate::builder::{BlockAnd, BlockAndExtension, Builder, NeedsTemporary};
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
@@ -56,9 +57,11 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
 
         match expr.kind {
             ExprKind::ThreadLocalRef(did) => block.and(Rvalue::ThreadLocalRef(did)),
-            ExprKind::Scope { region_scope, lint_level, value } => {
+            ExprKind::Scope { region_scope, hir_id, value } => {
                 let region_scope = (region_scope, source_info);
-                this.in_scope(region_scope, lint_level, |this| this.as_rvalue(block, scope, value))
+                this.in_scope(region_scope, LintLevel::Explicit(hir_id), |this| {
+                    this.as_rvalue(block, scope, value)
+                })
             }
             ExprKind::Repeat { value, count } => {
                 if Some(0) == count.try_to_target_usize(this.tcx) {
@@ -657,7 +660,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     source: eid,
                     is_from_as_cast: _,
                 }
-                | &ExprKind::Scope { region_scope: _, lint_level: _, value: eid } => {
+                | &ExprKind::Scope { region_scope: _, hir_id: _, value: eid } => {
                     kind = &self.thir[eid].kind
                 }
                 _ => return matches!(Category::of(&kind), Some(Category::Constant)),
diff --git a/compiler/rustc_mir_build/src/builder/expr/as_temp.rs b/compiler/rustc_mir_build/src/builder/expr/as_temp.rs
index d8ac19e34aae8..55296c647c819 100644
--- a/compiler/rustc_mir_build/src/builder/expr/as_temp.rs
+++ b/compiler/rustc_mir_build/src/builder/expr/as_temp.rs
@@ -7,7 +7,7 @@ use rustc_middle::mir::*;
 use rustc_middle::thir::*;
 use tracing::{debug, instrument};
 
-use crate::builder::scope::DropKind;
+use crate::builder::scope::{DropKind, LintLevel};
 use crate::builder::{BlockAnd, BlockAndExtension, Builder};
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
@@ -39,10 +39,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let expr = &this.thir[expr_id];
         let expr_span = expr.span;
         let source_info = this.source_info(expr_span);
-        if let ExprKind::Scope { region_scope, lint_level, value } = expr.kind {
-            return this.in_scope((region_scope, source_info), lint_level, |this| {
-                this.as_temp(block, temp_lifetime, value, mutability)
-            });
+        if let ExprKind::Scope { region_scope, hir_id, value } = expr.kind {
+            return this.in_scope(
+                (region_scope, source_info),
+                LintLevel::Explicit(hir_id),
+                |this| this.as_temp(block, temp_lifetime, value, mutability),
+            );
         }
 
         let expr_ty = expr.ty;
diff --git a/compiler/rustc_mir_build/src/builder/expr/into.rs b/compiler/rustc_mir_build/src/builder/expr/into.rs
index f595cfc77e9d7..60e05b691a83b 100644
--- a/compiler/rustc_mir_build/src/builder/expr/into.rs
+++ b/compiler/rustc_mir_build/src/builder/expr/into.rs
@@ -16,6 +16,7 @@ use tracing::{debug, instrument};
 
 use crate::builder::expr::category::{Category, RvalueFunc};
 use crate::builder::matches::{DeclareLetBindings, HasMatchGuard};
+use crate::builder::scope::LintLevel;
 use crate::builder::{BlockAnd, BlockAndExtension, BlockFrame, Builder, NeedsTemporary};
 use crate::errors::{LoopMatchArmWithGuard, LoopMatchUnsupportedType};
 
@@ -45,10 +46,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         }
 
         let block_and = match expr.kind {
-            ExprKind::Scope { region_scope, lint_level, value } => {
+            ExprKind::Scope { region_scope, hir_id, value } => {
                 let region_scope = (region_scope, source_info);
                 ensure_sufficient_stack(|| {
-                    this.in_scope(region_scope, lint_level, |this| {
+                    this.in_scope(region_scope, LintLevel::Explicit(hir_id), |this| {
                         this.expr_into_dest(destination, block, value)
                     })
                 })
diff --git a/compiler/rustc_mir_build/src/builder/expr/stmt.rs b/compiler/rustc_mir_build/src/builder/expr/stmt.rs
index 66ee139398499..3d603afbaa4a7 100644
--- a/compiler/rustc_mir_build/src/builder/expr/stmt.rs
+++ b/compiler/rustc_mir_build/src/builder/expr/stmt.rs
@@ -5,7 +5,7 @@ use rustc_middle::thir::*;
 use rustc_span::source_map::Spanned;
 use tracing::debug;
 
-use crate::builder::scope::BreakableTarget;
+use crate::builder::scope::{BreakableTarget, LintLevel};
 use crate::builder::{BlockAnd, BlockAndExtension, BlockFrame, Builder};
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
@@ -25,8 +25,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         // Handle a number of expressions that don't need a destination at all. This
         // avoids needing a mountain of temporary `()` variables.
         match expr.kind {
-            ExprKind::Scope { region_scope, lint_level, value } => {
-                this.in_scope((region_scope, source_info), lint_level, |this| {
+            ExprKind::Scope { region_scope, hir_id, value } => {
+                this.in_scope((region_scope, source_info), LintLevel::Explicit(hir_id), |this| {
                     this.stmt_expr(block, value, statement_scope)
                 })
             }
@@ -106,7 +106,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             }
             ExprKind::Become { value } => {
                 let v = &this.thir[value];
-                let ExprKind::Scope { value, lint_level, region_scope } = v.kind else {
+                let ExprKind::Scope { value, hir_id, region_scope } = v.kind else {
                     span_bug!(v.span, "`thir_check_tail_calls` should have disallowed this {v:?}")
                 };
 
@@ -115,7 +115,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     span_bug!(v.span, "`thir_check_tail_calls` should have disallowed this {v:?}")
                 };
 
-                this.in_scope((region_scope, source_info), lint_level, |this| {
+                this.in_scope((region_scope, source_info), LintLevel::Explicit(hir_id), |this| {
                     let fun = unpack!(block = this.as_local_operand(block, fun));
                     let args: Box<[_]> = args
                         .into_iter()
diff --git a/compiler/rustc_mir_build/src/builder/matches/match_pair.rs b/compiler/rustc_mir_build/src/builder/matches/match_pair.rs
index 8cee3ff27e8f9..3edd0234b0ad7 100644
--- a/compiler/rustc_mir_build/src/builder/matches/match_pair.rs
+++ b/compiler/rustc_mir_build/src/builder/matches/match_pair.rs
@@ -40,58 +40,44 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         match_pairs: &mut Vec<MatchPairTree<'tcx>>,
         extra_data: &mut PatternExtraData<'tcx>,
         place: &PlaceBuilder<'tcx>,
+        array_len: Option<u64>,
         prefix: &[Pat<'tcx>],
         opt_slice: &Option<Box<Pat<'tcx>>>,
         suffix: &[Pat<'tcx>],
     ) {
-        let tcx = self.tcx;
-        let (min_length, exact_size) = if let Some(place_resolved) = place.try_to_place(self) {
-            let place_ty = place_resolved.ty(&self.local_decls, tcx).ty;
-            match place_ty.kind() {
-                ty::Array(_, length) => {
-                    if let Some(length) = length.try_to_target_usize(tcx) {
-                        (length, true)
-                    } else {
-                        // This can happen when the array length is a generic const
-                        // expression that couldn't be evaluated (e.g., due to an error).
-                        // Since there's already a compilation error, we use a fallback
-                        // to avoid an ICE.
-                        tcx.dcx().span_delayed_bug(
-                            tcx.def_span(self.def_id),
-                            "array length in pattern couldn't be evaluated",
-                        );
-                        ((prefix.len() + suffix.len()).try_into().unwrap(), false)
-                    }
-                }
-                _ => ((prefix.len() + suffix.len()).try_into().unwrap(), false),
-            }
-        } else {
-            ((prefix.len() + suffix.len()).try_into().unwrap(), false)
+        let prefix_len = u64::try_from(prefix.len()).unwrap();
+        let suffix_len = u64::try_from(suffix.len()).unwrap();
+
+        // For slice patterns with a `..` followed by 0 or more suffix subpatterns,
+        // the actual slice index of those subpatterns isn't statically known, so
+        // we have to index them relative to the end of the slice.
+        //
+        // For array patterns, all subpatterns are indexed relative to the start.
+        let (min_length, is_array) = match array_len {
+            Some(len) => (len, true),
+            None => (prefix_len + suffix_len, false),
         };
 
-        for (idx, subpattern) in prefix.iter().enumerate() {
-            let elem =
-                ProjectionElem::ConstantIndex { offset: idx as u64, min_length, from_end: false };
+        for (offset, subpattern) in (0u64..).zip(prefix) {
+            let elem = ProjectionElem::ConstantIndex { offset, min_length, from_end: false };
             let place = place.clone_project(elem);
             MatchPairTree::for_pattern(place, subpattern, self, match_pairs, extra_data)
         }
 
         if let Some(subslice_pat) = opt_slice {
-            let suffix_len = suffix.len() as u64;
             let subslice = place.clone_project(PlaceElem::Subslice {
-                from: prefix.len() as u64,
-                to: if exact_size { min_length - suffix_len } else { suffix_len },
-                from_end: !exact_size,
+                from: prefix_len,
+                to: if is_array { min_length - suffix_len } else { suffix_len },
+                from_end: !is_array,
             });
             MatchPairTree::for_pattern(subslice, subslice_pat, self, match_pairs, extra_data);
         }
 
-        for (idx, subpattern) in suffix.iter().rev().enumerate() {
-            let end_offset = (idx + 1) as u64;
+        for (end_offset, subpattern) in (1u64..).zip(suffix.iter().rev()) {
             let elem = ProjectionElem::ConstantIndex {
-                offset: if exact_size { min_length - end_offset } else { end_offset },
+                offset: if is_array { min_length - end_offset } else { end_offset },
                 min_length,
-                from_end: !exact_size,
+                from_end: !is_array,
             };
             let place = place.clone_project(elem);
             MatchPairTree::for_pattern(place, subpattern, self, match_pairs, extra_data)
@@ -256,14 +242,36 @@ impl<'tcx> MatchPairTree<'tcx> {
             }
 
             PatKind::Array { ref prefix, ref slice, ref suffix } => {
-                cx.prefix_slice_suffix(
-                    &mut subpairs,
-                    extra_data,
-                    &place_builder,
-                    prefix,
-                    slice,
-                    suffix,
-                );
+                // Determine the statically-known length of the array type being matched.
+                // This should always succeed for legal programs, but could fail for
+                // erroneous programs (e.g. the type is `[u8; const { panic!() }]`),
+                // so take care not to ICE if this fails.
+                let array_len = match pattern.ty.kind() {
+                    ty::Array(_, len) => len.try_to_target_usize(cx.tcx),
+                    _ => None,
+                };
+                if let Some(array_len) = array_len {
+                    cx.prefix_slice_suffix(
+                        &mut subpairs,
+                        extra_data,
+                        &place_builder,
+                        Some(array_len),
+                        prefix,
+                        slice,
+                        suffix,
+                    );
+                } else {
+                    // If the array length couldn't be determined, ignore the
+                    // subpatterns and delayed-assert that compilation will fail.
+                    cx.tcx.dcx().span_delayed_bug(
+                        pattern.span,
+                        format!(
+                            "array length in pattern couldn't be determined for ty={:?}",
+                            pattern.ty
+                        ),
+                    );
+                }
+
                 None
             }
             PatKind::Slice { ref prefix, ref slice, ref suffix } => {
@@ -271,6 +279,7 @@ impl<'tcx> MatchPairTree<'tcx> {
                     &mut subpairs,
                     extra_data,
                     &place_builder,
+                    None,
                     prefix,
                     slice,
                     suffix,
diff --git a/compiler/rustc_mir_build/src/builder/matches/mod.rs b/compiler/rustc_mir_build/src/builder/matches/mod.rs
index 590316a475549..0463f7c914a4a 100644
--- a/compiler/rustc_mir_build/src/builder/matches/mod.rs
+++ b/compiler/rustc_mir_build/src/builder/matches/mod.rs
@@ -29,7 +29,7 @@ use crate::builder::ForGuard::{self, OutsideGuard, RefWithinGuard};
 use crate::builder::expr::as_place::PlaceBuilder;
 use crate::builder::matches::buckets::PartitionedCandidates;
 use crate::builder::matches::user_ty::ProjectedUserTypesNode;
-use crate::builder::scope::DropKind;
+use crate::builder::scope::{DropKind, LintLevel};
 use crate::builder::{
     BlockAnd, BlockAndExtension, Builder, GuardFrame, GuardFrameLocal, LocalsForNode,
 };
@@ -182,9 +182,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 this.break_for_else(success_block, args.variable_source_info);
                 failure_block.unit()
             }
-            ExprKind::Scope { region_scope, lint_level, value } => {
+            ExprKind::Scope { region_scope, hir_id, value } => {
                 let region_scope = (region_scope, this.source_info(expr_span));
-                this.in_scope(region_scope, lint_level, |this| {
+                this.in_scope(region_scope, LintLevel::Explicit(hir_id), |this| {
                     this.then_else_break_inner(block, value, args)
                 })
             }
@@ -434,7 +434,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 let guard_scope = arm
                     .guard
                     .map(|_| region::Scope { data: region::ScopeData::MatchGuard, ..arm.scope });
-                self.in_scope(arm_scope, arm.lint_level, |this| {
+                self.in_scope(arm_scope, LintLevel::Explicit(arm.hir_id), |this| {
                     this.opt_in_scope(guard_scope.map(|scope| (scope, arm_source_info)), |this| {
                         // `if let` guard temps needing deduplicating will be in the guard scope.
                         let old_dedup_scope =
diff --git a/compiler/rustc_mir_build/src/builder/mod.rs b/compiler/rustc_mir_build/src/builder/mod.rs
index 75c6df842b50b..317df4e64fdb3 100644
--- a/compiler/rustc_mir_build/src/builder/mod.rs
+++ b/compiler/rustc_mir_build/src/builder/mod.rs
@@ -38,14 +38,14 @@ use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
 use rustc_middle::hir::place::PlaceBase as HirPlaceBase;
 use rustc_middle::middle::region;
 use rustc_middle::mir::*;
-use rustc_middle::thir::{self, ExprId, LintLevel, LocalVarId, Param, ParamId, PatKind, Thir};
+use rustc_middle::thir::{self, ExprId, LocalVarId, Param, ParamId, PatKind, Thir};
 use rustc_middle::ty::{self, ScalarInt, Ty, TyCtxt, TypeVisitableExt, TypingMode};
 use rustc_middle::{bug, span_bug};
 use rustc_session::lint;
 use rustc_span::{Span, Symbol, sym};
 
 use crate::builder::expr::as_place::PlaceBuilder;
-use crate::builder::scope::DropKind;
+use crate::builder::scope::{DropKind, LintLevel};
 use crate::errors;
 
 pub(crate) fn closure_saved_names_of_captured_variables<'tcx>(
diff --git a/compiler/rustc_mir_build/src/builder/scope.rs b/compiler/rustc_mir_build/src/builder/scope.rs
index 9817040525368..b10df60e0f75b 100644
--- a/compiler/rustc_mir_build/src/builder/scope.rs
+++ b/compiler/rustc_mir_build/src/builder/scope.rs
@@ -89,7 +89,7 @@ use rustc_hir::HirId;
 use rustc_index::{IndexSlice, IndexVec};
 use rustc_middle::middle::region;
 use rustc_middle::mir::{self, *};
-use rustc_middle::thir::{AdtExpr, AdtExprBase, ArmId, ExprId, ExprKind, LintLevel};
+use rustc_middle::thir::{AdtExpr, AdtExprBase, ArmId, ExprId, ExprKind};
 use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt, ValTree};
 use rustc_middle::{bug, span_bug};
 use rustc_pattern_analysis::rustc::RustcPatCtxt;
@@ -522,6 +522,14 @@ impl<'tcx> Scopes<'tcx> {
     }
 }
 
+/// Used by [`Builder::in_scope`] to create source scopes mapping from MIR back to HIR at points
+/// where lint levels change.
+#[derive(Copy, Clone, Debug)]
+pub(crate) enum LintLevel {
+    Inherited,
+    Explicit(HirId),
+}
+
 impl<'a, 'tcx> Builder<'a, 'tcx> {
     // Adding and removing scopes
     // ==========================
diff --git a/compiler/rustc_mir_build/src/check_unsafety.rs b/compiler/rustc_mir_build/src/check_unsafety.rs
index 68b8a842a2a69..4a20b05d1fc2d 100644
--- a/compiler/rustc_mir_build/src/check_unsafety.rs
+++ b/compiler/rustc_mir_build/src/check_unsafety.rs
@@ -476,7 +476,7 @@ impl<'a, 'tcx> Visitor<'a, 'tcx> for UnsafetyVisitor<'a, 'tcx> {
             }
         };
         match expr.kind {
-            ExprKind::Scope { value, lint_level: LintLevel::Explicit(hir_id), region_scope: _ } => {
+            ExprKind::Scope { value, hir_id, region_scope: _ } => {
                 let prev_id = self.hir_context;
                 self.hir_context = hir_id;
                 ensure_sufficient_stack(|| {
diff --git a/compiler/rustc_mir_build/src/thir/cx/block.rs b/compiler/rustc_mir_build/src/thir/cx/block.rs
index 7cdd70a7fc272..fad73a7115b0a 100644
--- a/compiler/rustc_mir_build/src/thir/cx/block.rs
+++ b/compiler/rustc_mir_build/src/thir/cx/block.rs
@@ -88,7 +88,7 @@ impl<'tcx> ThirBuildCx<'tcx> {
                                 pattern,
                                 initializer: local.init.map(|init| self.mirror_expr(init)),
                                 else_block,
-                                lint_level: LintLevel::Explicit(local.hir_id),
+                                hir_id: local.hir_id,
                                 span,
                             },
                         };
diff --git a/compiler/rustc_mir_build/src/thir/cx/expr.rs b/compiler/rustc_mir_build/src/thir/cx/expr.rs
index 50ccbd50d9711..8e02424706eec 100644
--- a/compiler/rustc_mir_build/src/thir/cx/expr.rs
+++ b/compiler/rustc_mir_build/src/thir/cx/expr.rs
@@ -77,7 +77,7 @@ impl<'tcx> ThirBuildCx<'tcx> {
             kind: ExprKind::Scope {
                 region_scope: expr_scope,
                 value: self.thir.exprs.push(expr),
-                lint_level: LintLevel::Explicit(hir_expr.hir_id),
+                hir_id: hir_expr.hir_id,
             },
         };
 
@@ -1192,7 +1192,7 @@ impl<'tcx> ThirBuildCx<'tcx> {
             pattern: self.pattern_from_hir(&arm.pat),
             guard: arm.guard.as_ref().map(|g| self.mirror_expr(g)),
             body: self.mirror_expr(arm.body),
-            lint_level: LintLevel::Explicit(arm.hir_id),
+            hir_id: arm.hir_id,
             scope: region::Scope { local_id: arm.hir_id.local_id, data: region::ScopeData::Node },
             span: arm.span,
         };
diff --git a/compiler/rustc_mir_build/src/thir/pattern/check_match.rs b/compiler/rustc_mir_build/src/thir/pattern/check_match.rs
index d9a06de32bb0f..290d4ab2bfbb0 100644
--- a/compiler/rustc_mir_build/src/thir/pattern/check_match.rs
+++ b/compiler/rustc_mir_build/src/thir/pattern/check_match.rs
@@ -43,7 +43,7 @@ pub(crate) fn check_match(tcx: TyCtxt<'_>, def_id: LocalDefId) -> Result<(), Err
         typeck_results,
         // FIXME(#132279): We're in a body, should handle opaques.
         typing_env: ty::TypingEnv::non_body_analysis(tcx, def_id),
-        lint_level: tcx.local_def_id_to_hir_id(def_id),
+        hir_source: tcx.local_def_id_to_hir_id(def_id),
         let_source: LetSource::None,
         pattern_arena: &pattern_arena,
         dropless_arena: &dropless_arena,
@@ -92,7 +92,7 @@ struct MatchVisitor<'p, 'tcx> {
     typing_env: ty::TypingEnv<'tcx>,
     typeck_results: &'tcx ty::TypeckResults<'tcx>,
     thir: &'p Thir<'tcx>,
-    lint_level: HirId,
+    hir_source: HirId,
     let_source: LetSource,
     pattern_arena: &'p TypedArena<DeconstructedPat<'p, 'tcx>>,
     dropless_arena: &'p DroplessArena,
@@ -111,7 +111,7 @@ impl<'p, 'tcx> Visitor<'p, 'tcx> for MatchVisitor<'p, 'tcx> {
 
     #[instrument(level = "trace", skip(self))]
     fn visit_arm(&mut self, arm: &'p Arm<'tcx>) {
-        self.with_lint_level(arm.lint_level, |this| {
+        self.with_hir_source(arm.hir_id, |this| {
             if let Some(expr) = arm.guard {
                 this.with_let_source(LetSource::IfLetGuard, |this| {
                     this.visit_expr(&this.thir[expr])
@@ -125,8 +125,8 @@ impl<'p, 'tcx> Visitor<'p, 'tcx> for MatchVisitor<'p, 'tcx> {
     #[instrument(level = "trace", skip(self))]
     fn visit_expr(&mut self, ex: &'p Expr<'tcx>) {
         match ex.kind {
-            ExprKind::Scope { value, lint_level, .. } => {
-                self.with_lint_level(lint_level, |this| {
+            ExprKind::Scope { value, hir_id, .. } => {
+                self.with_hir_source(hir_id, |this| {
                     this.visit_expr(&this.thir[value]);
                 });
                 return;
@@ -181,10 +181,8 @@ impl<'p, 'tcx> Visitor<'p, 'tcx> for MatchVisitor<'p, 'tcx> {
 
     fn visit_stmt(&mut self, stmt: &'p Stmt<'tcx>) {
         match stmt.kind {
-            StmtKind::Let {
-                box ref pattern, initializer, else_block, lint_level, span, ..
-            } => {
-                self.with_lint_level(lint_level, |this| {
+            StmtKind::Let { box ref pattern, initializer, else_block, hir_id, span, .. } => {
+                self.with_hir_source(hir_id, |this| {
                     let let_source =
                         if else_block.is_some() { LetSource::LetElse } else { LetSource::PlainLet };
                     this.with_let_source(let_source, |this| {
@@ -209,20 +207,12 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
         self.let_source = old_let_source;
     }
 
-    fn with_lint_level<T>(
-        &mut self,
-        new_lint_level: LintLevel,
-        f: impl FnOnce(&mut Self) -> T,
-    ) -> T {
-        if let LintLevel::Explicit(hir_id) = new_lint_level {
-            let old_lint_level = self.lint_level;
-            self.lint_level = hir_id;
-            let ret = f(self);
-            self.lint_level = old_lint_level;
-            ret
-        } else {
-            f(self)
-        }
+    fn with_hir_source<T>(&mut self, new_hir_source: HirId, f: impl FnOnce(&mut Self) -> T) -> T {
+        let old_hir_source = self.hir_source;
+        self.hir_source = new_hir_source;
+        let ret = f(self);
+        self.hir_source = old_hir_source;
+        ret
     }
 
     /// Visit a nested chain of `&&`. Used for if-let chains. This must call `visit_expr` on the
@@ -233,9 +223,9 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
         accumulator: &mut Vec<Option<(Span, RefutableFlag)>>,
     ) -> Result<(), ErrorGuaranteed> {
         match ex.kind {
-            ExprKind::Scope { value, lint_level, .. } => self.with_lint_level(lint_level, |this| {
-                this.visit_land(&this.thir[value], accumulator)
-            }),
+            ExprKind::Scope { value, hir_id, .. } => {
+                self.with_hir_source(hir_id, |this| this.visit_land(&this.thir[value], accumulator))
+            }
             ExprKind::LogicalOp { op: LogicalOp::And, lhs, rhs } => {
                 // We recurse into the lhs only, because `&&` chains associate to the left.
                 let res_lhs = self.visit_land(&self.thir[lhs], accumulator);
@@ -259,8 +249,8 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
         ex: &'p Expr<'tcx>,
     ) -> Result<Option<(Span, RefutableFlag)>, ErrorGuaranteed> {
         match ex.kind {
-            ExprKind::Scope { value, lint_level, .. } => {
-                self.with_lint_level(lint_level, |this| this.visit_land_rhs(&this.thir[value]))
+            ExprKind::Scope { value, hir_id, .. } => {
+                self.with_hir_source(hir_id, |this| this.visit_land_rhs(&this.thir[value]))
             }
             ExprKind::Let { box ref pat, expr } => {
                 let expr = &self.thir()[expr];
@@ -398,9 +388,9 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
             tcx: self.tcx,
             typeck_results: self.typeck_results,
             typing_env: self.typing_env,
-            module: self.tcx.parent_module(self.lint_level).to_def_id(),
+            module: self.tcx.parent_module(self.hir_source).to_def_id(),
             dropless_arena: self.dropless_arena,
-            match_lint_level: self.lint_level,
+            match_lint_level: self.hir_source,
             whole_match_span,
             scrut_span,
             refutable,
@@ -448,7 +438,7 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
             if matches!(refutability, Irrefutable) {
                 report_irrefutable_let_patterns(
                     self.tcx,
-                    self.lint_level,
+                    self.hir_source,
                     self.let_source,
                     1,
                     span,
@@ -470,10 +460,10 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
         let mut tarms = Vec::with_capacity(arms.len());
         for &arm in arms {
             let arm = &self.thir.arms[arm];
-            let got_error = self.with_lint_level(arm.lint_level, |this| {
+            let got_error = self.with_hir_source(arm.hir_id, |this| {
                 let Ok(pat) = this.lower_pattern(&cx, &arm.pattern) else { return true };
                 let arm =
-                    MatchArm { pat, arm_data: this.lint_level, has_guard: arm.guard.is_some() };
+                    MatchArm { pat, arm_data: this.hir_source, has_guard: arm.guard.is_some() };
                 tarms.push(arm);
                 false
             });
@@ -572,7 +562,7 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
             // The entire chain is made up of irrefutable `let` statements
             report_irrefutable_let_patterns(
                 self.tcx,
-                self.lint_level,
+                self.hir_source,
                 self.let_source,
                 chain_refutabilities.len(),
                 whole_chain_span,
@@ -605,7 +595,7 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
                 let count = prefix.len();
                 self.tcx.emit_node_span_lint(
                     IRREFUTABLE_LET_PATTERNS,
-                    self.lint_level,
+                    self.hir_source,
                     span,
                     LeadingIrrefutableLetPatterns { count },
                 );
@@ -624,7 +614,7 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
             let count = suffix.len();
             self.tcx.emit_node_span_lint(
                 IRREFUTABLE_LET_PATTERNS,
-                self.lint_level,
+                self.hir_source,
                 span,
                 TrailingIrrefutableLetPatterns { count },
             );
@@ -639,7 +629,7 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
     ) -> Result<(PatCtxt<'p, 'tcx>, UsefulnessReport<'p, 'tcx>), ErrorGuaranteed> {
         let cx = self.new_cx(refutability, None, scrut, pat.span);
         let pat = self.lower_pattern(&cx, pat)?;
-        let arms = [MatchArm { pat, arm_data: self.lint_level, has_guard: false }];
+        let arms = [MatchArm { pat, arm_data: self.hir_source, has_guard: false }];
         let report = self.analyze_patterns(&cx, &arms, pat.ty().inner())?;
         Ok((cx, report))
     }
@@ -886,7 +876,7 @@ fn check_for_bindings_named_same_as_variants(
         let ty_path = with_no_trimmed_paths!(cx.tcx.def_path_str(edef.did()));
         cx.tcx.emit_node_span_lint(
             BINDINGS_WITH_VARIANT_NAME,
-            cx.lint_level,
+            cx.hir_source,
             pat.span,
             BindingsWithVariantName {
                 // If this is an irrefutable pattern, and there's > 1 variant,
diff --git a/compiler/rustc_mir_build/src/thir/print.rs b/compiler/rustc_mir_build/src/thir/print.rs
index e12909305961d..2cafb73a74a44 100644
--- a/compiler/rustc_mir_build/src/thir/print.rs
+++ b/compiler/rustc_mir_build/src/thir/print.rs
@@ -160,7 +160,7 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
                 pattern,
                 initializer,
                 else_block,
-                lint_level,
+                hir_id,
                 span,
             } => {
                 print_indented!(self, "kind: Let {", depth_lvl + 1);
@@ -191,7 +191,7 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
                     print_indented!(self, "else_block: None", depth_lvl + 2);
                 }
 
-                print_indented!(self, format!("lint_level: {:?}", lint_level), depth_lvl + 2);
+                print_indented!(self, format!("hir_id: {:?}", hir_id), depth_lvl + 2);
                 print_indented!(self, format!("span: {:?}", span), depth_lvl + 2);
                 print_indented!(self, "}", depth_lvl + 1);
             }
@@ -215,10 +215,10 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
         use rustc_middle::thir::ExprKind::*;
 
         match expr_kind {
-            Scope { region_scope, value, lint_level } => {
+            Scope { region_scope, value, hir_id } => {
                 print_indented!(self, "Scope {", depth_lvl);
                 print_indented!(self, format!("region_scope: {:?}", region_scope), depth_lvl + 1);
-                print_indented!(self, format!("lint_level: {:?}", lint_level), depth_lvl + 1);
+                print_indented!(self, format!("hir_id: {:?}", hir_id), depth_lvl + 1);
                 print_indented!(self, "value:", depth_lvl + 1);
                 self.print_expr(*value, depth_lvl + 2);
                 print_indented!(self, "}", depth_lvl);
@@ -660,7 +660,7 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
         print_indented!(self, "Arm {", depth_lvl);
 
         let arm = &self.thir.arms[arm_id];
-        let Arm { pattern, guard, body, lint_level, scope, span } = arm;
+        let Arm { pattern, guard, body, hir_id, scope, span } = arm;
 
         print_indented!(self, "pattern: ", depth_lvl + 1);
         self.print_pat(pattern, depth_lvl + 2);
@@ -674,7 +674,7 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
 
         print_indented!(self, "body: ", depth_lvl + 1);
         self.print_expr(*body, depth_lvl + 2);
-        print_indented!(self, format!("lint_level: {:?}", lint_level), depth_lvl + 1);
+        print_indented!(self, format!("hir_id: {:?}", hir_id), depth_lvl + 1);
         print_indented!(self, format!("scope: {:?}", scope), depth_lvl + 1);
         print_indented!(self, format!("span: {:?}", span), depth_lvl + 1);
         print_indented!(self, "}", depth_lvl);
diff --git a/tests/ui/imports/ambiguous-10.rs b/tests/ui/imports/ambiguous-10.rs
index 166b01ede12d3..61069cb75124a 100644
--- a/tests/ui/imports/ambiguous-10.rs
+++ b/tests/ui/imports/ambiguous-10.rs
@@ -1,5 +1,5 @@
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1637022296
-
+//@ check-pass
 mod a {
     pub enum Token {}
 }
@@ -13,6 +13,6 @@ mod b {
 use crate::a::*;
 use crate::b::*;
 fn c(_: Token) {}
-//~^ ERROR `Token` is ambiguous
+//~^ WARN `Token` is ambiguous
 //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 fn main() { }
diff --git a/tests/ui/imports/ambiguous-10.stderr b/tests/ui/imports/ambiguous-10.stderr
index f175d27c99e98..4ae3e4203fab8 100644
--- a/tests/ui/imports/ambiguous-10.stderr
+++ b/tests/ui/imports/ambiguous-10.stderr
@@ -1,4 +1,4 @@
-error: `Token` is ambiguous
+warning: `Token` is ambiguous
   --> $DIR/ambiguous-10.rs:15:9
    |
 LL | fn c(_: Token) {}
@@ -19,12 +19,12 @@ note: `Token` could also refer to the enum imported here
 LL | use crate::b::*;
    |     ^^^^^^^^^^^
    = help: consider adding an explicit import of `Token` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `Token` is ambiguous
+warning: `Token` is ambiguous
   --> $DIR/ambiguous-10.rs:15:9
    |
 LL | fn c(_: Token) {}
@@ -45,5 +45,5 @@ note: `Token` could also refer to the enum imported here
 LL | use crate::b::*;
    |     ^^^^^^^^^^^
    = help: consider adding an explicit import of `Token` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-12.rs b/tests/ui/imports/ambiguous-12.rs
index 543396b8dfe5c..93cd3ca6f347a 100644
--- a/tests/ui/imports/ambiguous-12.rs
+++ b/tests/ui/imports/ambiguous-12.rs
@@ -1,5 +1,5 @@
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1637022296
-
+//@ check-pass
 macro_rules! m {
     () => {
         pub fn b() {}
@@ -19,6 +19,6 @@ use crate::public::*;
 
 fn main() {
     b();
-    //~^ ERROR `b` is ambiguous
+    //~^ WARN `b` is ambiguous
     //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 }
diff --git a/tests/ui/imports/ambiguous-12.stderr b/tests/ui/imports/ambiguous-12.stderr
index 5f92eae0dbcb1..1a1777dedac48 100644
--- a/tests/ui/imports/ambiguous-12.stderr
+++ b/tests/ui/imports/ambiguous-12.stderr
@@ -1,4 +1,4 @@
-error: `b` is ambiguous
+warning: `b` is ambiguous
   --> $DIR/ambiguous-12.rs:21:5
    |
 LL |     b();
@@ -19,12 +19,12 @@ note: `b` could also refer to the function imported here
 LL | use crate::public::*;
    |     ^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `b` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `b` is ambiguous
+warning: `b` is ambiguous
   --> $DIR/ambiguous-12.rs:21:5
    |
 LL |     b();
@@ -45,5 +45,5 @@ note: `b` could also refer to the function imported here
 LL | use crate::public::*;
    |     ^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `b` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-13.rs b/tests/ui/imports/ambiguous-13.rs
index 3569dd5d9adc2..5fbb71d8545a0 100644
--- a/tests/ui/imports/ambiguous-13.rs
+++ b/tests/ui/imports/ambiguous-13.rs
@@ -1,5 +1,5 @@
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1637022296
-
+//@ check-pass
 pub mod object {
     #[derive(Debug)]
     pub struct Rect;
@@ -16,6 +16,6 @@ use crate::object::*;
 use crate::content::*;
 
 fn a(_: Rect) {}
-//~^ ERROR `Rect` is ambiguous
+//~^ WARN `Rect` is ambiguous
 //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 fn main() { }
diff --git a/tests/ui/imports/ambiguous-13.stderr b/tests/ui/imports/ambiguous-13.stderr
index 279b4e8f1420a..ca83cf63c12c1 100644
--- a/tests/ui/imports/ambiguous-13.stderr
+++ b/tests/ui/imports/ambiguous-13.stderr
@@ -1,4 +1,4 @@
-error: `Rect` is ambiguous
+warning: `Rect` is ambiguous
   --> $DIR/ambiguous-13.rs:18:9
    |
 LL | fn a(_: Rect) {}
@@ -19,12 +19,12 @@ note: `Rect` could also refer to the struct imported here
 LL | use crate::content::*;
    |     ^^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `Rect` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `Rect` is ambiguous
+warning: `Rect` is ambiguous
   --> $DIR/ambiguous-13.rs:18:9
    |
 LL | fn a(_: Rect) {}
@@ -45,5 +45,5 @@ note: `Rect` could also refer to the struct imported here
 LL | use crate::content::*;
    |     ^^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `Rect` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-14.rs b/tests/ui/imports/ambiguous-14.rs
index ba2d7dc4e0166..325b29f3b481e 100644
--- a/tests/ui/imports/ambiguous-14.rs
+++ b/tests/ui/imports/ambiguous-14.rs
@@ -1,6 +1,6 @@
 //@ edition:2015
 // https://github.com/rust-lang/rust/issues/98467
-
+//@ check-pass
 mod a {
     pub fn foo() {}
 }
@@ -21,6 +21,6 @@ mod g {
 
 fn main() {
     g::foo();
-    //~^ ERROR `foo` is ambiguous
+    //~^ WARN `foo` is ambiguous
     //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 }
diff --git a/tests/ui/imports/ambiguous-14.stderr b/tests/ui/imports/ambiguous-14.stderr
index 2a3557c31f120..6823d728c368f 100644
--- a/tests/ui/imports/ambiguous-14.stderr
+++ b/tests/ui/imports/ambiguous-14.stderr
@@ -1,4 +1,4 @@
-error: `foo` is ambiguous
+warning: `foo` is ambiguous
   --> $DIR/ambiguous-14.rs:23:8
    |
 LL |     g::foo();
@@ -19,12 +19,12 @@ note: `foo` could also refer to the function imported here
 LL |     pub use f::*;
    |             ^^^^
    = help: consider adding an explicit import of `foo` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `foo` is ambiguous
+warning: `foo` is ambiguous
   --> $DIR/ambiguous-14.rs:23:8
    |
 LL |     g::foo();
@@ -45,5 +45,5 @@ note: `foo` could also refer to the function imported here
 LL |     pub use f::*;
    |             ^^^^
    = help: consider adding an explicit import of `foo` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-15.rs b/tests/ui/imports/ambiguous-15.rs
index 07d8893b2dead..f90d9696e8efd 100644
--- a/tests/ui/imports/ambiguous-15.rs
+++ b/tests/ui/imports/ambiguous-15.rs
@@ -1,5 +1,5 @@
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1638206152
-
+//@ check-pass
 mod t2 {
     #[derive(Debug)]
     pub enum Error {}
@@ -20,7 +20,7 @@ mod t3 {
 
 use self::t3::*;
 fn a<E: Error>(_: E) {}
-//~^ ERROR `Error` is ambiguous
+//~^ WARN `Error` is ambiguous
 //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 fn main() {}
diff --git a/tests/ui/imports/ambiguous-15.stderr b/tests/ui/imports/ambiguous-15.stderr
index 15f83546532ec..59f9cb0526fcc 100644
--- a/tests/ui/imports/ambiguous-15.stderr
+++ b/tests/ui/imports/ambiguous-15.stderr
@@ -1,4 +1,4 @@
-error: `Error` is ambiguous
+warning: `Error` is ambiguous
   --> $DIR/ambiguous-15.rs:22:9
    |
 LL | fn a<E: Error>(_: E) {}
@@ -19,12 +19,12 @@ note: `Error` could also refer to the enum imported here
 LL | pub use t2::*;
    |         ^^^^^
    = help: consider adding an explicit import of `Error` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `Error` is ambiguous
+warning: `Error` is ambiguous
   --> $DIR/ambiguous-15.rs:22:9
    |
 LL | fn a<E: Error>(_: E) {}
@@ -45,5 +45,5 @@ note: `Error` could also refer to the enum imported here
 LL | pub use t2::*;
    |         ^^^^^
    = help: consider adding an explicit import of `Error` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-16.rs b/tests/ui/imports/ambiguous-16.rs
index f31c78d18a380..2cd1e2aca9d33 100644
--- a/tests/ui/imports/ambiguous-16.rs
+++ b/tests/ui/imports/ambiguous-16.rs
@@ -1,5 +1,5 @@
 // https://github.com/rust-lang/rust/pull/113099
-
+//@ check-pass
 mod framing {
     mod public_message {
         use super::*;
@@ -20,7 +20,7 @@ mod framing {
 }
 
 use crate::framing::ConfirmedTranscriptHashInput;
-//~^ ERROR `ConfirmedTranscriptHashInput` is ambiguous
+//~^ WARN `ConfirmedTranscriptHashInput` is ambiguous
 //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 fn main() { }
diff --git a/tests/ui/imports/ambiguous-16.stderr b/tests/ui/imports/ambiguous-16.stderr
index 7c80dee17f040..bb76111ebe89e 100644
--- a/tests/ui/imports/ambiguous-16.stderr
+++ b/tests/ui/imports/ambiguous-16.stderr
@@ -1,4 +1,4 @@
-error: `ConfirmedTranscriptHashInput` is ambiguous
+warning: `ConfirmedTranscriptHashInput` is ambiguous
   --> $DIR/ambiguous-16.rs:22:21
    |
 LL | use crate::framing::ConfirmedTranscriptHashInput;
@@ -19,12 +19,12 @@ note: `ConfirmedTranscriptHashInput` could also refer to the struct imported her
 LL |     pub use self::public_message_in::*;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `ConfirmedTranscriptHashInput` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `ConfirmedTranscriptHashInput` is ambiguous
+warning: `ConfirmedTranscriptHashInput` is ambiguous
   --> $DIR/ambiguous-16.rs:22:21
    |
 LL | use crate::framing::ConfirmedTranscriptHashInput;
@@ -45,5 +45,5 @@ note: `ConfirmedTranscriptHashInput` could also refer to the struct imported her
 LL |     pub use self::public_message_in::*;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `ConfirmedTranscriptHashInput` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-17.rs b/tests/ui/imports/ambiguous-17.rs
index 3a51c156d34ca..8ef0318fa046b 100644
--- a/tests/ui/imports/ambiguous-17.rs
+++ b/tests/ui/imports/ambiguous-17.rs
@@ -1,6 +1,6 @@
 //@ edition:2015
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1638206152
-
+//@ check-pass
 pub use evp::*; //~ WARNING ambiguous glob re-exports
 pub use handwritten::*;
 
@@ -24,6 +24,6 @@ mod handwritten {
 
 fn main() {
     id();
-    //~^ ERROR `id` is ambiguous
+    //~^ WARN `id` is ambiguous
     //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 }
diff --git a/tests/ui/imports/ambiguous-17.stderr b/tests/ui/imports/ambiguous-17.stderr
index 1849b83d76a35..ef4a835a0b3c5 100644
--- a/tests/ui/imports/ambiguous-17.stderr
+++ b/tests/ui/imports/ambiguous-17.stderr
@@ -8,7 +8,7 @@ LL | pub use handwritten::*;
    |
    = note: `#[warn(ambiguous_glob_reexports)]` on by default
 
-error: `id` is ambiguous
+warning: `id` is ambiguous
   --> $DIR/ambiguous-17.rs:26:5
    |
 LL |     id();
@@ -29,12 +29,12 @@ note: `id` could also refer to the function imported here
 LL | pub use handwritten::*;
    |         ^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `id` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error; 1 warning emitted
+warning: 2 warnings emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `id` is ambiguous
+warning: `id` is ambiguous
   --> $DIR/ambiguous-17.rs:26:5
    |
 LL |     id();
@@ -55,5 +55,5 @@ note: `id` could also refer to the function imported here
 LL | pub use handwritten::*;
    |         ^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `id` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-2.rs b/tests/ui/imports/ambiguous-2.rs
index 65c971c00b9ac..978655bc01776 100644
--- a/tests/ui/imports/ambiguous-2.rs
+++ b/tests/ui/imports/ambiguous-2.rs
@@ -1,9 +1,9 @@
 //@ aux-build: ../ambiguous-1.rs
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1633574396
-
+//@ check-pass
 extern crate ambiguous_1;
 
 fn main() {
-    ambiguous_1::id(); //~ ERROR `id` is ambiguous
+    ambiguous_1::id(); //~ WARN `id` is ambiguous
                        //~| WARN this was previously accepted
 }
diff --git a/tests/ui/imports/ambiguous-2.stderr b/tests/ui/imports/ambiguous-2.stderr
index d428e58a78fd7..a0222099239aa 100644
--- a/tests/ui/imports/ambiguous-2.stderr
+++ b/tests/ui/imports/ambiguous-2.stderr
@@ -1,4 +1,4 @@
-error: `id` is ambiguous
+warning: `id` is ambiguous
   --> $DIR/ambiguous-2.rs:7:18
    |
 LL |     ambiguous_1::id();
@@ -17,12 +17,12 @@ note: `id` could also refer to the function defined here
    |
 LL |     pub use self::handwritten::*;
    |             ^^^^^^^^^^^^^^^^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `id` is ambiguous
+warning: `id` is ambiguous
   --> $DIR/ambiguous-2.rs:7:18
    |
 LL |     ambiguous_1::id();
@@ -41,5 +41,5 @@ note: `id` could also refer to the function defined here
    |
 LL |     pub use self::handwritten::*;
    |             ^^^^^^^^^^^^^^^^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-3.rs b/tests/ui/imports/ambiguous-3.rs
index ff0dcc221ec05..717c1eb8597ac 100644
--- a/tests/ui/imports/ambiguous-3.rs
+++ b/tests/ui/imports/ambiguous-3.rs
@@ -1,9 +1,9 @@
 // https://github.com/rust-lang/rust/issues/47525
-
+//@ check-pass
 fn main() {
     use a::*;
     x();
-    //~^ ERROR `x` is ambiguous
+    //~^ WARN `x` is ambiguous
     //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 }
 
diff --git a/tests/ui/imports/ambiguous-3.stderr b/tests/ui/imports/ambiguous-3.stderr
index 27fa05a195b94..7addf9bc797c5 100644
--- a/tests/ui/imports/ambiguous-3.stderr
+++ b/tests/ui/imports/ambiguous-3.stderr
@@ -1,4 +1,4 @@
-error: `x` is ambiguous
+warning: `x` is ambiguous
   --> $DIR/ambiguous-3.rs:5:5
    |
 LL |     x();
@@ -19,12 +19,12 @@ note: `x` could also refer to the function imported here
 LL |     pub use self::c::*;
    |             ^^^^^^^^^^
    = help: consider adding an explicit import of `x` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `x` is ambiguous
+warning: `x` is ambiguous
   --> $DIR/ambiguous-3.rs:5:5
    |
 LL |     x();
@@ -45,5 +45,5 @@ note: `x` could also refer to the function imported here
 LL |     pub use self::c::*;
    |             ^^^^^^^^^^
    = help: consider adding an explicit import of `x` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-4.rs b/tests/ui/imports/ambiguous-4.rs
index e66d231f93cc3..1a2bfeaf53dc6 100644
--- a/tests/ui/imports/ambiguous-4.rs
+++ b/tests/ui/imports/ambiguous-4.rs
@@ -1,9 +1,9 @@
 //@ edition:2015
 //@ aux-build: ../ambiguous-4-extern.rs
-
+//@ check-pass
 extern crate ambiguous_4_extern;
 
 fn main() {
-    ambiguous_4_extern::id(); //~ ERROR `id` is ambiguous
+    ambiguous_4_extern::id(); //~ WARN `id` is ambiguous
                               //~| WARN this was previously accepted
 }
diff --git a/tests/ui/imports/ambiguous-4.stderr b/tests/ui/imports/ambiguous-4.stderr
index cf4127cbbb1cc..6c1a2679fcaea 100644
--- a/tests/ui/imports/ambiguous-4.stderr
+++ b/tests/ui/imports/ambiguous-4.stderr
@@ -1,4 +1,4 @@
-error: `id` is ambiguous
+warning: `id` is ambiguous
   --> $DIR/ambiguous-4.rs:7:25
    |
 LL |     ambiguous_4_extern::id();
@@ -17,12 +17,12 @@ note: `id` could also refer to the function defined here
    |
 LL | pub use handwritten::*;
    |         ^^^^^^^^^^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `id` is ambiguous
+warning: `id` is ambiguous
   --> $DIR/ambiguous-4.rs:7:25
    |
 LL |     ambiguous_4_extern::id();
@@ -41,5 +41,5 @@ note: `id` could also refer to the function defined here
    |
 LL | pub use handwritten::*;
    |         ^^^^^^^^^^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-5.rs b/tests/ui/imports/ambiguous-5.rs
index 8f89c966d4a5d..9879216280a29 100644
--- a/tests/ui/imports/ambiguous-5.rs
+++ b/tests/ui/imports/ambiguous-5.rs
@@ -1,5 +1,5 @@
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1637022296
-
+//@ check-pass
 mod a {
     pub struct Class(u16);
 }
@@ -10,7 +10,7 @@ mod gpos {
     use super::gsubgpos::*;
     use super::*;
     struct MarkRecord(Class);
-    //~^ ERROR`Class` is ambiguous
+    //~^ WARN`Class` is ambiguous
     //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 }
 
diff --git a/tests/ui/imports/ambiguous-5.stderr b/tests/ui/imports/ambiguous-5.stderr
index 1fc5f4543f358..a4f3151c9e85c 100644
--- a/tests/ui/imports/ambiguous-5.stderr
+++ b/tests/ui/imports/ambiguous-5.stderr
@@ -1,4 +1,4 @@
-error: `Class` is ambiguous
+warning: `Class` is ambiguous
   --> $DIR/ambiguous-5.rs:12:23
    |
 LL |     struct MarkRecord(Class);
@@ -19,12 +19,12 @@ note: `Class` could also refer to the struct imported here
 LL |     use super::gsubgpos::*;
    |         ^^^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `Class` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `Class` is ambiguous
+warning: `Class` is ambiguous
   --> $DIR/ambiguous-5.rs:12:23
    |
 LL |     struct MarkRecord(Class);
@@ -45,5 +45,5 @@ note: `Class` could also refer to the struct imported here
 LL |     use super::gsubgpos::*;
    |         ^^^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `Class` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-6.rs b/tests/ui/imports/ambiguous-6.rs
index 1c6e34377165a..9a3a138bda4c7 100644
--- a/tests/ui/imports/ambiguous-6.rs
+++ b/tests/ui/imports/ambiguous-6.rs
@@ -1,10 +1,10 @@
 //@ edition: 2021
 // https://github.com/rust-lang/rust/issues/112713
-
+//@ check-pass
 pub fn foo() -> u32 {
     use sub::*;
     C
-    //~^ ERROR `C` is ambiguous
+    //~^ WARN `C` is ambiguous
     //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 }
 
diff --git a/tests/ui/imports/ambiguous-6.stderr b/tests/ui/imports/ambiguous-6.stderr
index 681bc40931f52..d811cfa4236aa 100644
--- a/tests/ui/imports/ambiguous-6.stderr
+++ b/tests/ui/imports/ambiguous-6.stderr
@@ -1,4 +1,4 @@
-error: `C` is ambiguous
+warning: `C` is ambiguous
   --> $DIR/ambiguous-6.rs:6:5
    |
 LL |     C
@@ -19,12 +19,12 @@ note: `C` could also refer to the constant imported here
 LL |     pub use mod2::*;
    |             ^^^^^^^
    = help: consider adding an explicit import of `C` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `C` is ambiguous
+warning: `C` is ambiguous
   --> $DIR/ambiguous-6.rs:6:5
    |
 LL |     C
@@ -45,5 +45,5 @@ note: `C` could also refer to the constant imported here
 LL |     pub use mod2::*;
    |             ^^^^^^^
    = help: consider adding an explicit import of `C` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-9.rs b/tests/ui/imports/ambiguous-9.rs
index c10b1268060ce..e6329b8d46acc 100644
--- a/tests/ui/imports/ambiguous-9.rs
+++ b/tests/ui/imports/ambiguous-9.rs
@@ -1,5 +1,5 @@
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1638206152
-
+//@ check-pass
 pub mod dsl {
     mod range {
         pub fn date_range() {}
@@ -21,8 +21,8 @@ use prelude::*;
 
 fn main() {
     date_range();
-    //~^ ERROR `date_range` is ambiguous
+    //~^ WARN `date_range` is ambiguous
     //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-    //~| ERROR `date_range` is ambiguous
+    //~| WARN `date_range` is ambiguous
     //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 }
diff --git a/tests/ui/imports/ambiguous-9.stderr b/tests/ui/imports/ambiguous-9.stderr
index 800a2e10c9d78..da7d2d970fdda 100644
--- a/tests/ui/imports/ambiguous-9.stderr
+++ b/tests/ui/imports/ambiguous-9.stderr
@@ -8,7 +8,7 @@ LL |     use super::prelude::*;
    |
    = note: `#[warn(ambiguous_glob_reexports)]` on by default
 
-error: `date_range` is ambiguous
+warning: `date_range` is ambiguous
   --> $DIR/ambiguous-9.rs:23:5
    |
 LL |     date_range();
@@ -29,7 +29,7 @@ note: `date_range` could also refer to the function imported here
 LL |     use super::prelude::*;
    |         ^^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
 warning: ambiguous glob re-exports
   --> $DIR/ambiguous-9.rs:15:13
@@ -39,7 +39,7 @@ LL |     pub use self::t::*;
 LL |     pub use super::dsl::*;
    |             ------------- but the name `date_range` in the value namespace is also re-exported here
 
-error: `date_range` is ambiguous
+warning: `date_range` is ambiguous
   --> $DIR/ambiguous-9.rs:23:5
    |
 LL |     date_range();
@@ -61,10 +61,10 @@ LL | use prelude::*;
    |     ^^^^^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
 
-error: aborting due to 2 previous errors; 2 warnings emitted
+warning: 4 warnings emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `date_range` is ambiguous
+warning: `date_range` is ambiguous
   --> $DIR/ambiguous-9.rs:23:5
    |
 LL |     date_range();
@@ -85,10 +85,10 @@ note: `date_range` could also refer to the function imported here
 LL |     use super::prelude::*;
    |         ^^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
 Future breakage diagnostic:
-error: `date_range` is ambiguous
+warning: `date_range` is ambiguous
   --> $DIR/ambiguous-9.rs:23:5
    |
 LL |     date_range();
@@ -109,5 +109,5 @@ note: `date_range` could also refer to the function imported here
 LL | use prelude::*;
    |     ^^^^^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/ambiguous-panic-globvsglob.rs b/tests/ui/imports/ambiguous-panic-globvsglob.rs
index 4ff3cc8225355..335fba74b2088 100644
--- a/tests/ui/imports/ambiguous-panic-globvsglob.rs
+++ b/tests/ui/imports/ambiguous-panic-globvsglob.rs
@@ -3,7 +3,7 @@
 mod m1 {
     pub use core::prelude::v1::*;
 }
-
+//@ check-pass
 mod m2 {
     pub use std::prelude::v1::*;
 }
@@ -18,6 +18,6 @@ fn foo() {
     panic!();
     //~^ WARN: `panic` is ambiguous [ambiguous_panic_imports]
     //~| WARN: this was previously accepted by the compiler
-    //~| ERROR: `panic` is ambiguous [ambiguous_glob_imports]
+    //~| WARN: `panic` is ambiguous [ambiguous_glob_imports]
     //~| WARN: this was previously accepted by the compiler
 }
diff --git a/tests/ui/imports/ambiguous-panic-globvsglob.stderr b/tests/ui/imports/ambiguous-panic-globvsglob.stderr
index 455c58bb6c025..8e216b21734f5 100644
--- a/tests/ui/imports/ambiguous-panic-globvsglob.stderr
+++ b/tests/ui/imports/ambiguous-panic-globvsglob.stderr
@@ -1,4 +1,4 @@
-error: `panic` is ambiguous
+warning: `panic` is ambiguous
   --> $DIR/ambiguous-panic-globvsglob.rs:18:5
    |
 LL |     panic!();
@@ -19,7 +19,7 @@ note: `panic` could also refer to the macro imported here
 LL |     use m2::*;
    |         ^^^^^
    = help: consider adding an explicit import of `panic` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
 warning: `panic` is ambiguous
   --> $DIR/ambiguous-panic-globvsglob.rs:18:5
@@ -40,10 +40,10 @@ note: `panic` could also refer to a macro from prelude
   --> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
    = note: `#[warn(ambiguous_panic_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error; 1 warning emitted
+warning: 2 warnings emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `panic` is ambiguous
+warning: `panic` is ambiguous
   --> $DIR/ambiguous-panic-globvsglob.rs:18:5
    |
 LL |     panic!();
@@ -64,5 +64,5 @@ note: `panic` could also refer to the macro imported here
 LL |     use m2::*;
    |         ^^^^^
    = help: consider adding an explicit import of `panic` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/duplicate.rs b/tests/ui/imports/duplicate.rs
index 0a652889ca8ad..ef54726c9a938 100644
--- a/tests/ui/imports/duplicate.rs
+++ b/tests/ui/imports/duplicate.rs
@@ -34,7 +34,7 @@ fn main() {
     e::foo();
     f::foo(); //~ ERROR `foo` is ambiguous
     g::foo();
-    //~^ ERROR `foo` is ambiguous
+    //~^ WARN `foo` is ambiguous
     //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 }
 
diff --git a/tests/ui/imports/duplicate.stderr b/tests/ui/imports/duplicate.stderr
index 74829fc21e22f..9252a041749d5 100644
--- a/tests/ui/imports/duplicate.stderr
+++ b/tests/ui/imports/duplicate.stderr
@@ -68,7 +68,7 @@ LL |     use self::m2::*;
    |         ^^^^^^^^^^^
    = help: consider adding an explicit import of `foo` to disambiguate
 
-error: `foo` is ambiguous
+warning: `foo` is ambiguous
   --> $DIR/duplicate.rs:36:8
    |
 LL |     g::foo();
@@ -89,14 +89,14 @@ note: `foo` could also refer to the function imported here
 LL |     pub use crate::f::*;
    |             ^^^^^^^^^^^
    = help: consider adding an explicit import of `foo` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 5 previous errors
+error: aborting due to 4 previous errors; 1 warning emitted
 
 Some errors have detailed explanations: E0252, E0659.
 For more information about an error, try `rustc --explain E0252`.
 Future incompatibility report: Future breakage diagnostic:
-error: `foo` is ambiguous
+warning: `foo` is ambiguous
   --> $DIR/duplicate.rs:36:8
    |
 LL |     g::foo();
@@ -117,5 +117,5 @@ note: `foo` could also refer to the function imported here
 LL |     pub use crate::f::*;
    |             ^^^^^^^^^^^
    = help: consider adding an explicit import of `foo` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/glob-conflict-cross-crate-1.rs b/tests/ui/imports/glob-conflict-cross-crate-1.rs
index 08ce6166b5c1d..787fa36db2d90 100644
--- a/tests/ui/imports/glob-conflict-cross-crate-1.rs
+++ b/tests/ui/imports/glob-conflict-cross-crate-1.rs
@@ -1,11 +1,11 @@
 //@ edition:2015
 //@ aux-build:glob-conflict.rs
-
+//@ check-pass
 extern crate glob_conflict;
 
 fn main() {
-    glob_conflict::f(); //~ ERROR `f` is ambiguous
+    glob_conflict::f(); //~ WARN `f` is ambiguous
                         //~| WARN this was previously accepted
-    glob_conflict::glob::f(); //~ ERROR `f` is ambiguous
+    glob_conflict::glob::f(); //~ WARN `f` is ambiguous
                               //~| WARN this was previously accepted
 }
diff --git a/tests/ui/imports/glob-conflict-cross-crate-1.stderr b/tests/ui/imports/glob-conflict-cross-crate-1.stderr
index 54b7976b057e0..4401136536751 100644
--- a/tests/ui/imports/glob-conflict-cross-crate-1.stderr
+++ b/tests/ui/imports/glob-conflict-cross-crate-1.stderr
@@ -1,4 +1,4 @@
-error: `f` is ambiguous
+warning: `f` is ambiguous
   --> $DIR/glob-conflict-cross-crate-1.rs:7:20
    |
 LL |     glob_conflict::f();
@@ -17,9 +17,9 @@ note: `f` could also refer to the function defined here
    |
 LL | pub use m2::*;
    |         ^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: `f` is ambiguous
+warning: `f` is ambiguous
   --> $DIR/glob-conflict-cross-crate-1.rs:9:26
    |
 LL |     glob_conflict::glob::f();
@@ -39,10 +39,10 @@ note: `f` could also refer to the function defined here
 LL | pub use m2::*;
    |         ^^
 
-error: aborting due to 2 previous errors
+warning: 2 warnings emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `f` is ambiguous
+warning: `f` is ambiguous
   --> $DIR/glob-conflict-cross-crate-1.rs:7:20
    |
 LL |     glob_conflict::f();
@@ -61,10 +61,10 @@ note: `f` could also refer to the function defined here
    |
 LL | pub use m2::*;
    |         ^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
 Future breakage diagnostic:
-error: `f` is ambiguous
+warning: `f` is ambiguous
   --> $DIR/glob-conflict-cross-crate-1.rs:9:26
    |
 LL |     glob_conflict::glob::f();
@@ -83,5 +83,5 @@ note: `f` could also refer to the function defined here
    |
 LL | pub use m2::*;
    |         ^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/glob-conflict-cross-crate-2.rs b/tests/ui/imports/glob-conflict-cross-crate-2.rs
index b4dd3d8eeb443..018a74d35d7f7 100644
--- a/tests/ui/imports/glob-conflict-cross-crate-2.rs
+++ b/tests/ui/imports/glob-conflict-cross-crate-2.rs
@@ -1,10 +1,10 @@
 //@ aux-build:glob-conflict-cross-crate-2-extern.rs
-
+//@ check-pass
 extern crate glob_conflict_cross_crate_2_extern;
 
 use glob_conflict_cross_crate_2_extern::*;
 
 fn main() {
-    let _a: C = 1; //~ ERROR `C` is ambiguous
+    let _a: C = 1; //~ WARN `C` is ambiguous
                    //~| WARN this was previously accepted
 }
diff --git a/tests/ui/imports/glob-conflict-cross-crate-2.stderr b/tests/ui/imports/glob-conflict-cross-crate-2.stderr
index cbc2180c14f43..2ee519a364b30 100644
--- a/tests/ui/imports/glob-conflict-cross-crate-2.stderr
+++ b/tests/ui/imports/glob-conflict-cross-crate-2.stderr
@@ -1,4 +1,4 @@
-error: `C` is ambiguous
+warning: `C` is ambiguous
   --> $DIR/glob-conflict-cross-crate-2.rs:8:13
    |
 LL |     let _a: C = 1;
@@ -17,12 +17,12 @@ note: `C` could also refer to the type alias defined here
    |
 LL | pub use b::*;
    |         ^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `C` is ambiguous
+warning: `C` is ambiguous
   --> $DIR/glob-conflict-cross-crate-2.rs:8:13
    |
 LL |     let _a: C = 1;
@@ -41,5 +41,5 @@ note: `C` could also refer to the type alias defined here
    |
 LL | pub use b::*;
    |         ^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/glob-conflict-cross-crate-3.rs b/tests/ui/imports/glob-conflict-cross-crate-3.rs
index 31c234b9250fc..a7b215359090d 100644
--- a/tests/ui/imports/glob-conflict-cross-crate-3.rs
+++ b/tests/ui/imports/glob-conflict-cross-crate-3.rs
@@ -1,5 +1,5 @@
 //@ aux-build:glob-conflict-cross-crate-2-extern.rs
-
+//@ check-pass
 extern crate glob_conflict_cross_crate_2_extern;
 
 mod a {
@@ -11,8 +11,8 @@ use a::*;
 
 fn main() {
     let _a: C = 1;
-    //~^ ERROR `C` is ambiguous
-    //~| ERROR `C` is ambiguous
+    //~^ WARN `C` is ambiguous
+    //~| WARN `C` is ambiguous
     //~| WARN this was previously accepted
     //~| WARN this was previously accepted
 }
diff --git a/tests/ui/imports/glob-conflict-cross-crate-3.stderr b/tests/ui/imports/glob-conflict-cross-crate-3.stderr
index 213eafda20b72..c7457efe866ef 100644
--- a/tests/ui/imports/glob-conflict-cross-crate-3.stderr
+++ b/tests/ui/imports/glob-conflict-cross-crate-3.stderr
@@ -1,4 +1,4 @@
-error: `C` is ambiguous
+warning: `C` is ambiguous
   --> $DIR/glob-conflict-cross-crate-3.rs:13:13
    |
 LL |     let _a: C = 1;
@@ -17,9 +17,9 @@ note: `C` could also refer to the type alias defined here
    |
 LL | pub use b::*;
    |         ^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: `C` is ambiguous
+warning: `C` is ambiguous
   --> $DIR/glob-conflict-cross-crate-3.rs:13:13
    |
 LL |     let _a: C = 1;
@@ -41,10 +41,10 @@ LL | use a::*;
    |     ^^^^
    = help: consider adding an explicit import of `C` to disambiguate
 
-error: aborting due to 2 previous errors
+warning: 2 warnings emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `C` is ambiguous
+warning: `C` is ambiguous
   --> $DIR/glob-conflict-cross-crate-3.rs:13:13
    |
 LL |     let _a: C = 1;
@@ -63,10 +63,10 @@ note: `C` could also refer to the type alias defined here
    |
 LL | pub use b::*;
    |         ^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
 Future breakage diagnostic:
-error: `C` is ambiguous
+warning: `C` is ambiguous
   --> $DIR/glob-conflict-cross-crate-3.rs:13:13
    |
 LL |     let _a: C = 1;
@@ -87,5 +87,5 @@ note: `C` could also refer to the type alias imported here
 LL | use a::*;
    |     ^^^^
    = help: consider adding an explicit import of `C` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/issue-114682-2.rs b/tests/ui/imports/issue-114682-2.rs
index a9459c5b02ef6..da145f3addc0f 100644
--- a/tests/ui/imports/issue-114682-2.rs
+++ b/tests/ui/imports/issue-114682-2.rs
@@ -1,12 +1,12 @@
 //@ aux-build: issue-114682-2-extern.rs
 // https://github.com/rust-lang/rust/pull/114682#issuecomment-1879998900
-
+//@ check-pass
 extern crate issue_114682_2_extern;
 
-use issue_114682_2_extern::max; //~ ERROR `max` is ambiguous
+use issue_114682_2_extern::max; //~ WARN `max` is ambiguous
                                 //~| WARN this was previously accepted
 
-type A = issue_114682_2_extern::max; //~ ERROR `max` is ambiguous
+type A = issue_114682_2_extern::max; //~ WARN `max` is ambiguous
                                      //~| WARN this was previously accepted
 
 fn main() {}
diff --git a/tests/ui/imports/issue-114682-2.stderr b/tests/ui/imports/issue-114682-2.stderr
index 07c696651c388..f93e4409f0c47 100644
--- a/tests/ui/imports/issue-114682-2.stderr
+++ b/tests/ui/imports/issue-114682-2.stderr
@@ -1,4 +1,4 @@
-error: `max` is ambiguous
+warning: `max` is ambiguous
   --> $DIR/issue-114682-2.rs:6:28
    |
 LL | use issue_114682_2_extern::max;
@@ -17,9 +17,9 @@ note: `max` could also refer to the module defined here
    |
 LL | pub use self::d::*;
    |         ^^^^^^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: `max` is ambiguous
+warning: `max` is ambiguous
   --> $DIR/issue-114682-2.rs:9:33
    |
 LL | type A = issue_114682_2_extern::max;
@@ -39,10 +39,10 @@ note: `max` could also refer to the module defined here
 LL | pub use self::d::*;
    |         ^^^^^^^
 
-error: aborting due to 2 previous errors
+warning: 2 warnings emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `max` is ambiguous
+warning: `max` is ambiguous
   --> $DIR/issue-114682-2.rs:6:28
    |
 LL | use issue_114682_2_extern::max;
@@ -61,10 +61,10 @@ note: `max` could also refer to the module defined here
    |
 LL | pub use self::d::*;
    |         ^^^^^^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
 Future breakage diagnostic:
-error: `max` is ambiguous
+warning: `max` is ambiguous
   --> $DIR/issue-114682-2.rs:9:33
    |
 LL | type A = issue_114682_2_extern::max;
@@ -83,5 +83,5 @@ note: `max` could also refer to the module defined here
    |
 LL | pub use self::d::*;
    |         ^^^^^^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/issue-114682-4.rs b/tests/ui/imports/issue-114682-4.rs
index 01921928a0079..29e175b5ed549 100644
--- a/tests/ui/imports/issue-114682-4.rs
+++ b/tests/ui/imports/issue-114682-4.rs
@@ -6,7 +6,7 @@ extern crate issue_114682_4_extern;
 use issue_114682_4_extern::*;
 
 //~v ERROR type alias takes 1 generic argument but 2 generic arguments were supplied
-fn a() -> Result<i32, ()> { //~ ERROR `Result` is ambiguous
+fn a() -> Result<i32, ()> { //~ WARN `Result` is ambiguous
                             //~| WARN this was previously accepted
     Ok(1)
 }
diff --git a/tests/ui/imports/issue-114682-4.stderr b/tests/ui/imports/issue-114682-4.stderr
index 5e677cd7ae724..12cb9ae95a426 100644
--- a/tests/ui/imports/issue-114682-4.stderr
+++ b/tests/ui/imports/issue-114682-4.stderr
@@ -1,4 +1,4 @@
-error: `Result` is ambiguous
+warning: `Result` is ambiguous
   --> $DIR/issue-114682-4.rs:9:11
    |
 LL | fn a() -> Result<i32, ()> {
@@ -17,7 +17,7 @@ note: `Result` could also refer to the type alias defined here
    |
 LL | pub use b::*;
    |         ^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
 error[E0107]: type alias takes 1 generic argument but 2 generic arguments were supplied
   --> $DIR/issue-114682-4.rs:9:11
@@ -33,11 +33,11 @@ note: type alias defined here, with 1 generic parameter: `T`
 LL |     pub type Result<T> = std::result::Result<T, ()>;
    |              ^^^^^^ -
 
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0107`.
 Future incompatibility report: Future breakage diagnostic:
-error: `Result` is ambiguous
+warning: `Result` is ambiguous
   --> $DIR/issue-114682-4.rs:9:11
    |
 LL | fn a() -> Result<i32, ()> {
@@ -56,5 +56,5 @@ note: `Result` could also refer to the type alias defined here
    |
 LL | pub use b::*;
    |         ^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/issue-114682-5.rs b/tests/ui/imports/issue-114682-5.rs
index be33960e40b81..1408a8105d752 100644
--- a/tests/ui/imports/issue-114682-5.rs
+++ b/tests/ui/imports/issue-114682-5.rs
@@ -9,7 +9,7 @@ extern crate issue_114682_5_extern_2;
 use issue_114682_5_extern_2::p::*;
 use issue_114682_5_extern_1::Url;
 //~^ ERROR `issue_114682_5_extern_1` is ambiguous
-//~| ERROR `issue_114682_5_extern_1` is ambiguous
+//~| WARN `issue_114682_5_extern_1` is ambiguous
 //~| ERROR unresolved import `issue_114682_5_extern_1::Url`
 //~| WARN this was previously accepted
 
diff --git a/tests/ui/imports/issue-114682-5.stderr b/tests/ui/imports/issue-114682-5.stderr
index 427a5b16765b5..74b42e0990b77 100644
--- a/tests/ui/imports/issue-114682-5.stderr
+++ b/tests/ui/imports/issue-114682-5.stderr
@@ -26,7 +26,7 @@ LL | use issue_114682_5_extern_2::p::*;
    = help: consider adding an explicit import of `issue_114682_5_extern_1` to disambiguate
    = help: or use `crate::issue_114682_5_extern_1` to refer to this module unambiguously
 
-error: `issue_114682_5_extern_1` is ambiguous
+warning: `issue_114682_5_extern_1` is ambiguous
   --> $DIR/issue-114682-5.rs:10:5
    |
 LL | use issue_114682_5_extern_1::Url;
@@ -46,14 +46,14 @@ note: `issue_114682_5_extern_1` could also refer to the crate defined here
 LL |     pub use crate::*;
    |             ^^^^^
    = help: use `::issue_114682_5_extern_1` to refer to this crate unambiguously
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors; 1 warning emitted
 
 Some errors have detailed explanations: E0432, E0659.
 For more information about an error, try `rustc --explain E0432`.
 Future incompatibility report: Future breakage diagnostic:
-error: `issue_114682_5_extern_1` is ambiguous
+warning: `issue_114682_5_extern_1` is ambiguous
   --> $DIR/issue-114682-5.rs:10:5
    |
 LL | use issue_114682_5_extern_1::Url;
@@ -73,5 +73,5 @@ note: `issue_114682_5_extern_1` could also refer to the crate defined here
 LL |     pub use crate::*;
    |             ^^^^^
    = help: use `::issue_114682_5_extern_1` to refer to this crate unambiguously
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/issue-114682-6.rs b/tests/ui/imports/issue-114682-6.rs
index 92173f4b8464f..480caedb70a17 100644
--- a/tests/ui/imports/issue-114682-6.rs
+++ b/tests/ui/imports/issue-114682-6.rs
@@ -1,12 +1,12 @@
 //@ aux-build: issue-114682-6-extern.rs
 // https://github.com/rust-lang/rust/pull/114682#issuecomment-1880755441
-
+//@ check-pass
 extern crate issue_114682_6_extern;
 
 use issue_114682_6_extern::*;
 
 fn main() {
-    let log = 2; //~ ERROR `log` is ambiguous
+    let log = 2; //~ WARN `log` is ambiguous
                  //~| WARN this was previously accepted
     let _ = log;
 }
diff --git a/tests/ui/imports/issue-114682-6.stderr b/tests/ui/imports/issue-114682-6.stderr
index 67ad25798c192..37f8f6c16ff24 100644
--- a/tests/ui/imports/issue-114682-6.stderr
+++ b/tests/ui/imports/issue-114682-6.stderr
@@ -1,4 +1,4 @@
-error: `log` is ambiguous
+warning: `log` is ambiguous
   --> $DIR/issue-114682-6.rs:9:9
    |
 LL |     let log = 2;
@@ -17,12 +17,12 @@ note: `log` could also refer to the function defined here
    |
 LL | pub use self::b::*;
    |         ^^^^^^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `log` is ambiguous
+warning: `log` is ambiguous
   --> $DIR/issue-114682-6.rs:9:9
    |
 LL |     let log = 2;
@@ -41,5 +41,5 @@ note: `log` could also refer to the function defined here
    |
 LL | pub use self::b::*;
    |         ^^^^^^^
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/overwrite-different-ambig-2.rs b/tests/ui/imports/overwrite-different-ambig-2.rs
index 1b6d20e24d309..1d6416c00fdc7 100644
--- a/tests/ui/imports/overwrite-different-ambig-2.rs
+++ b/tests/ui/imports/overwrite-different-ambig-2.rs
@@ -1,3 +1,5 @@
+//@ check-pass
+
 mod m1 {
     mod inner {
         pub struct S {}
@@ -19,6 +21,6 @@ use m1::*;
 use m2::*;
 
 fn main() {
-    let _: m1::S = S {}; //~ ERROR `S` is ambiguous
+    let _: m1::S = S {}; //~ WARN `S` is ambiguous
                          //~| WARN this was previously accepted
 }
diff --git a/tests/ui/imports/overwrite-different-ambig-2.stderr b/tests/ui/imports/overwrite-different-ambig-2.stderr
index e75f552d119c1..2d8446585717a 100644
--- a/tests/ui/imports/overwrite-different-ambig-2.stderr
+++ b/tests/ui/imports/overwrite-different-ambig-2.stderr
@@ -1,5 +1,5 @@
-error: `S` is ambiguous
-  --> $DIR/overwrite-different-ambig-2.rs:22:20
+warning: `S` is ambiguous
+  --> $DIR/overwrite-different-ambig-2.rs:24:20
    |
 LL |     let _: m1::S = S {};
    |                    ^ ambiguous name
@@ -8,24 +8,24 @@ LL |     let _: m1::S = S {};
    = note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `S` could refer to the struct imported here
-  --> $DIR/overwrite-different-ambig-2.rs:18:5
+  --> $DIR/overwrite-different-ambig-2.rs:20:5
    |
 LL | use m1::*;
    |     ^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
 note: `S` could also refer to the struct imported here
-  --> $DIR/overwrite-different-ambig-2.rs:19:5
+  --> $DIR/overwrite-different-ambig-2.rs:21:5
    |
 LL | use m2::*;
    |     ^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 1 previous error
+warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
-error: `S` is ambiguous
-  --> $DIR/overwrite-different-ambig-2.rs:22:20
+warning: `S` is ambiguous
+  --> $DIR/overwrite-different-ambig-2.rs:24:20
    |
 LL |     let _: m1::S = S {};
    |                    ^ ambiguous name
@@ -34,16 +34,16 @@ LL |     let _: m1::S = S {};
    = note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `S` could refer to the struct imported here
-  --> $DIR/overwrite-different-ambig-2.rs:18:5
+  --> $DIR/overwrite-different-ambig-2.rs:20:5
    |
 LL | use m1::*;
    |     ^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
 note: `S` could also refer to the struct imported here
-  --> $DIR/overwrite-different-ambig-2.rs:19:5
+  --> $DIR/overwrite-different-ambig-2.rs:21:5
    |
 LL | use m2::*;
    |     ^^^^^
    = help: consider adding an explicit import of `S` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/unresolved-seg-after-ambiguous.rs b/tests/ui/imports/unresolved-seg-after-ambiguous.rs
index 67366deabaafb..820f579ae3bbf 100644
--- a/tests/ui/imports/unresolved-seg-after-ambiguous.rs
+++ b/tests/ui/imports/unresolved-seg-after-ambiguous.rs
@@ -18,7 +18,7 @@ mod a {
 
 use self::a::E::in_exist;
 //~^ ERROR: unresolved import `self::a::E`
-//~| ERROR: `E` is ambiguous
+//~| WARN: `E` is ambiguous
 //~| WARNING: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 fn main() {}
diff --git a/tests/ui/imports/unresolved-seg-after-ambiguous.stderr b/tests/ui/imports/unresolved-seg-after-ambiguous.stderr
index 67316462a27e9..411cd1dbe5efa 100644
--- a/tests/ui/imports/unresolved-seg-after-ambiguous.stderr
+++ b/tests/ui/imports/unresolved-seg-after-ambiguous.stderr
@@ -4,7 +4,7 @@ error[E0432]: unresolved import `self::a::E`
 LL | use self::a::E::in_exist;
    |              ^ `E` is a struct, not a module
 
-error: `E` is ambiguous
+warning: `E` is ambiguous
   --> $DIR/unresolved-seg-after-ambiguous.rs:19:14
    |
 LL | use self::a::E::in_exist;
@@ -25,13 +25,13 @@ note: `E` could also refer to the struct imported here
 LL |         pub use self::d::*;
    |                 ^^^^^^^^^^
    = help: consider adding an explicit import of `E` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0432`.
 Future incompatibility report: Future breakage diagnostic:
-error: `E` is ambiguous
+warning: `E` is ambiguous
   --> $DIR/unresolved-seg-after-ambiguous.rs:19:14
    |
 LL | use self::a::E::in_exist;
@@ -52,5 +52,5 @@ note: `E` could also refer to the struct imported here
 LL |         pub use self::d::*;
    |                 ^^^^^^^^^^
    = help: consider adding an explicit import of `E` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
+   = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
 
diff --git a/tests/ui/pattern/type_mismatch.rs b/tests/ui/pattern/type_mismatch.rs
index 408ff75884712..39d57301e98fe 100644
--- a/tests/ui/pattern/type_mismatch.rs
+++ b/tests/ui/pattern/type_mismatch.rs
@@ -1,4 +1,4 @@
-//! This test used to ICE: rust-lang/rust#109812
+//! These tests used to ICE: rust-lang/rust#109812, rust-lang/rust#150507
 //! Instead of actually analyzing the erroneous patterns,
 //! we instead stop after typeck where errors are already
 //! reported.
@@ -8,12 +8,21 @@
 enum Either {
     One(X),
     Two(X),
+    Three { a: X },
 }
 
 struct X(Y);
 
 struct Y;
 
+struct Z(*const i32);
+unsafe impl Send for Z {}
+
+enum Meow {
+    A { a: Z },
+    B(Z),
+}
+
 fn consume_fnmut(_: impl FnMut()) {}
 
 fn move_into_fnmut() {
@@ -25,6 +34,58 @@ fn move_into_fnmut() {
 
         let X(mut _t) = x;
     });
+
+    consume_fnmut(|| {
+        let Either::Three { a: ref mut _t } = x;
+        //~^ ERROR: mismatched types
+
+        let X(mut _t) = x;
+    });
+}
+
+fn tuple_against_array() {
+    let variant: [();1] = [()];
+
+    || match variant {
+        (2,) => (),
+        //~^ ERROR: mismatched types
+        _ => {}
+    };
+
+    || {
+        let ((2,) | _) = variant;
+        //~^ ERROR: mismatched types
+    };
+}
+
+// Reproducer that triggers the compatibility lint more reliably, instead of relying on the fact
+// that at the time of writing, an unresolved integer type variable does not implement any
+// auto-traits.
+//
+// The @_ makes this example also reproduce ICE #150507 before PR #138961
+fn arcane() {
+    let variant: [();1] = [()];
+
+    || {
+        match variant {
+            (Z(y@_),) => {}
+            //~^ ERROR: mismatched types
+        }
+    };
+
+    || {
+        match variant {
+            Meow::A { a: Z(y@_) } => {}
+            //~^ ERROR: mismatched types
+        }
+    };
+
+    || {
+        match variant {
+            Meow::B(Z(y@_)) => {}
+            //~^ ERROR: mismatched types
+        }
+    };
 }
 
 fn main() {}
diff --git a/tests/ui/pattern/type_mismatch.stderr b/tests/ui/pattern/type_mismatch.stderr
index b0441b1fadcfe..3f24b2e706942 100644
--- a/tests/ui/pattern/type_mismatch.stderr
+++ b/tests/ui/pattern/type_mismatch.stderr
@@ -1,11 +1,68 @@
 error[E0308]: mismatched types
-  --> $DIR/type_mismatch.rs:23:13
+  --> $DIR/type_mismatch.rs:32:13
    |
 LL |         let Either::Two(ref mut _t) = x;
    |             ^^^^^^^^^^^^^^^^^^^^^^^   - this expression has type `X`
    |             |
    |             expected `X`, found `Either`
 
-error: aborting due to 1 previous error
+error[E0308]: mismatched types
+  --> $DIR/type_mismatch.rs:39:13
+   |
+LL |         let Either::Three { a: ref mut _t } = x;
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   - this expression has type `X`
+   |             |
+   |             expected `X`, found `Either`
+
+error[E0308]: mismatched types
+  --> $DIR/type_mismatch.rs:50:9
+   |
+LL |     || match variant {
+   |              ------- this expression has type `[(); 1]`
+LL |         (2,) => (),
+   |         ^^^^ expected `[(); 1]`, found `(_,)`
+   |
+   = note: expected array `[(); 1]`
+              found tuple `(_,)`
+
+error[E0308]: mismatched types
+  --> $DIR/type_mismatch.rs:56:14
+   |
+LL |         let ((2,) | _) = variant;
+   |              ^^^^        ------- this expression has type `[(); 1]`
+   |              |
+   |              expected `[(); 1]`, found `(_,)`
+   |
+   = note: expected array `[(); 1]`
+              found tuple `(_,)`
+
+error[E0308]: mismatched types
+  --> $DIR/type_mismatch.rs:71:13
+   |
+LL |         match variant {
+   |               ------- this expression has type `[(); 1]`
+LL |             (Z(y@_),) => {}
+   |             ^^^^^^^^^ expected `[(); 1]`, found `(_,)`
+   |
+   = note: expected array `[(); 1]`
+              found tuple `(_,)`
+
+error[E0308]: mismatched types
+  --> $DIR/type_mismatch.rs:78:13
+   |
+LL |         match variant {
+   |               ------- this expression has type `[(); 1]`
+LL |             Meow::A { a: Z(y@_) } => {}
+   |             ^^^^^^^^^^^^^^^^^^^^^ expected `[(); 1]`, found `Meow`
+
+error[E0308]: mismatched types
+  --> $DIR/type_mismatch.rs:85:13
+   |
+LL |         match variant {
+   |               ------- this expression has type `[(); 1]`
+LL |             Meow::B(Z(y@_)) => {}
+   |             ^^^^^^^^^^^^^^^ expected `[(); 1]`, found `Meow`
+
+error: aborting due to 7 previous errors
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/thir-print/c-variadic.stdout b/tests/ui/thir-print/c-variadic.stdout
index f1905e04f72bf..a3e3fa5e00081 100644
--- a/tests/ui/thir-print/c-variadic.stdout
+++ b/tests/ui/thir-print/c-variadic.stdout
@@ -39,7 +39,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(6)
-                lint_level: Explicit(HirId(DefId(0:3 ~ c_variadic[a5de]::foo).6))
+                hir_id: HirId(DefId(0:3 ~ c_variadic[a5de]::foo).6)
                 value:
                     Expr {
                         ty: ()
diff --git a/tests/ui/thir-print/offset_of.stdout b/tests/ui/thir-print/offset_of.stdout
index dcf60a86af9b4..29399bb98e32e 100644
--- a/tests/ui/thir-print/offset_of.stdout
+++ b/tests/ui/thir-print/offset_of.stdout
@@ -9,7 +9,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(52)
-                lint_level: Explicit(HirId(DefId(offset_of::concrete).52))
+                hir_id: HirId(DefId(offset_of::concrete).52)
                 value:
                     Expr {
                         ty: ()
@@ -51,7 +51,7 @@ body:
                                                     kind: 
                                                         Scope {
                                                             region_scope: Node(3)
-                                                            lint_level: Explicit(HirId(DefId(offset_of::concrete).3))
+                                                            hir_id: HirId(DefId(offset_of::concrete).3)
                                                             value:
                                                                 Expr {
                                                                     ty: usize
@@ -67,7 +67,7 @@ body:
                                                 }
                                             )
                                             else_block: None
-                                            lint_level: Explicit(HirId(DefId(offset_of::concrete).10))
+                                            hir_id: HirId(DefId(offset_of::concrete).10)
                                             span: $DIR/offset_of.rs:37:5: 1440:57 (#0)
                                         }
                                     }
@@ -100,7 +100,7 @@ body:
                                                     kind: 
                                                         Scope {
                                                             region_scope: Node(13)
-                                                            lint_level: Explicit(HirId(DefId(offset_of::concrete).13))
+                                                            hir_id: HirId(DefId(offset_of::concrete).13)
                                                             value:
                                                                 Expr {
                                                                     ty: usize
@@ -116,7 +116,7 @@ body:
                                                 }
                                             )
                                             else_block: None
-                                            lint_level: Explicit(HirId(DefId(offset_of::concrete).20))
+                                            hir_id: HirId(DefId(offset_of::concrete).20)
                                             span: $DIR/offset_of.rs:38:5: 1440:57 (#0)
                                         }
                                     }
@@ -149,7 +149,7 @@ body:
                                                     kind: 
                                                         Scope {
                                                             region_scope: Node(23)
-                                                            lint_level: Explicit(HirId(DefId(offset_of::concrete).23))
+                                                            hir_id: HirId(DefId(offset_of::concrete).23)
                                                             value:
                                                                 Expr {
                                                                     ty: usize
@@ -165,7 +165,7 @@ body:
                                                 }
                                             )
                                             else_block: None
-                                            lint_level: Explicit(HirId(DefId(offset_of::concrete).30))
+                                            hir_id: HirId(DefId(offset_of::concrete).30)
                                             span: $DIR/offset_of.rs:39:5: 1440:57 (#0)
                                         }
                                     }
@@ -198,7 +198,7 @@ body:
                                                     kind: 
                                                         Scope {
                                                             region_scope: Node(33)
-                                                            lint_level: Explicit(HirId(DefId(offset_of::concrete).33))
+                                                            hir_id: HirId(DefId(offset_of::concrete).33)
                                                             value:
                                                                 Expr {
                                                                     ty: usize
@@ -214,7 +214,7 @@ body:
                                                 }
                                             )
                                             else_block: None
-                                            lint_level: Explicit(HirId(DefId(offset_of::concrete).40))
+                                            hir_id: HirId(DefId(offset_of::concrete).40)
                                             span: $DIR/offset_of.rs:40:5: 1440:57 (#0)
                                         }
                                     }
@@ -247,7 +247,7 @@ body:
                                                     kind: 
                                                         Scope {
                                                             region_scope: Node(43)
-                                                            lint_level: Explicit(HirId(DefId(offset_of::concrete).43))
+                                                            hir_id: HirId(DefId(offset_of::concrete).43)
                                                             value:
                                                                 Expr {
                                                                     ty: usize
@@ -263,7 +263,7 @@ body:
                                                 }
                                             )
                                             else_block: None
-                                            lint_level: Explicit(HirId(DefId(offset_of::concrete).50))
+                                            hir_id: HirId(DefId(offset_of::concrete).50)
                                             span: $DIR/offset_of.rs:41:5: 1440:57 (#0)
                                         }
                                     }
@@ -286,7 +286,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(5)
-                lint_level: Explicit(HirId(DefId(offset_of::concrete).5))
+                hir_id: HirId(DefId(offset_of::concrete).5)
                 value:
                     Expr {
                         ty: usize
@@ -307,7 +307,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(7)
-                                                lint_level: Explicit(HirId(DefId(offset_of::concrete).7))
+                                                hir_id: HirId(DefId(offset_of::concrete).7)
                                                 value:
                                                     Expr {
                                                         ty: usize
@@ -369,7 +369,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(15)
-                lint_level: Explicit(HirId(DefId(offset_of::concrete).15))
+                hir_id: HirId(DefId(offset_of::concrete).15)
                 value:
                     Expr {
                         ty: usize
@@ -390,7 +390,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(17)
-                                                lint_level: Explicit(HirId(DefId(offset_of::concrete).17))
+                                                hir_id: HirId(DefId(offset_of::concrete).17)
                                                 value:
                                                     Expr {
                                                         ty: usize
@@ -452,7 +452,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(25)
-                lint_level: Explicit(HirId(DefId(offset_of::concrete).25))
+                hir_id: HirId(DefId(offset_of::concrete).25)
                 value:
                     Expr {
                         ty: usize
@@ -473,7 +473,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(27)
-                                                lint_level: Explicit(HirId(DefId(offset_of::concrete).27))
+                                                hir_id: HirId(DefId(offset_of::concrete).27)
                                                 value:
                                                     Expr {
                                                         ty: usize
@@ -535,7 +535,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(35)
-                lint_level: Explicit(HirId(DefId(offset_of::concrete).35))
+                hir_id: HirId(DefId(offset_of::concrete).35)
                 value:
                     Expr {
                         ty: usize
@@ -556,7 +556,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(37)
-                                                lint_level: Explicit(HirId(DefId(offset_of::concrete).37))
+                                                hir_id: HirId(DefId(offset_of::concrete).37)
                                                 value:
                                                     Expr {
                                                         ty: usize
@@ -670,7 +670,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(45)
-                lint_level: Explicit(HirId(DefId(offset_of::concrete).45))
+                hir_id: HirId(DefId(offset_of::concrete).45)
                 value:
                     Expr {
                         ty: usize
@@ -691,7 +691,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(47)
-                                                lint_level: Explicit(HirId(DefId(offset_of::concrete).47))
+                                                hir_id: HirId(DefId(offset_of::concrete).47)
                                                 value:
                                                     Expr {
                                                         ty: usize
@@ -805,7 +805,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(50)
-                lint_level: Explicit(HirId(DefId(offset_of::generic).50))
+                hir_id: HirId(DefId(offset_of::generic).50)
                 value:
                     Expr {
                         ty: ()
@@ -847,7 +847,7 @@ body:
                                                     kind: 
                                                         Scope {
                                                             region_scope: Node(3)
-                                                            lint_level: Explicit(HirId(DefId(offset_of::generic).3))
+                                                            hir_id: HirId(DefId(offset_of::generic).3)
                                                             value:
                                                                 Expr {
                                                                     ty: usize
@@ -863,7 +863,7 @@ body:
                                                 }
                                             )
                                             else_block: None
-                                            lint_level: Explicit(HirId(DefId(offset_of::generic).12))
+                                            hir_id: HirId(DefId(offset_of::generic).12)
                                             span: $DIR/offset_of.rs:45:5: 1440:57 (#0)
                                         }
                                     }
@@ -896,7 +896,7 @@ body:
                                                     kind: 
                                                         Scope {
                                                             region_scope: Node(15)
-                                                            lint_level: Explicit(HirId(DefId(offset_of::generic).15))
+                                                            hir_id: HirId(DefId(offset_of::generic).15)
                                                             value:
                                                                 Expr {
                                                                     ty: usize
@@ -912,7 +912,7 @@ body:
                                                 }
                                             )
                                             else_block: None
-                                            lint_level: Explicit(HirId(DefId(offset_of::generic).24))
+                                            hir_id: HirId(DefId(offset_of::generic).24)
                                             span: $DIR/offset_of.rs:46:5: 1440:57 (#0)
                                         }
                                     }
@@ -945,7 +945,7 @@ body:
                                                     kind: 
                                                         Scope {
                                                             region_scope: Node(27)
-                                                            lint_level: Explicit(HirId(DefId(offset_of::generic).27))
+                                                            hir_id: HirId(DefId(offset_of::generic).27)
                                                             value:
                                                                 Expr {
                                                                     ty: usize
@@ -961,7 +961,7 @@ body:
                                                 }
                                             )
                                             else_block: None
-                                            lint_level: Explicit(HirId(DefId(offset_of::generic).36))
+                                            hir_id: HirId(DefId(offset_of::generic).36)
                                             span: $DIR/offset_of.rs:47:5: 1440:57 (#0)
                                         }
                                     }
@@ -994,7 +994,7 @@ body:
                                                     kind: 
                                                         Scope {
                                                             region_scope: Node(39)
-                                                            lint_level: Explicit(HirId(DefId(offset_of::generic).39))
+                                                            hir_id: HirId(DefId(offset_of::generic).39)
                                                             value:
                                                                 Expr {
                                                                     ty: usize
@@ -1010,7 +1010,7 @@ body:
                                                 }
                                             )
                                             else_block: None
-                                            lint_level: Explicit(HirId(DefId(offset_of::generic).48))
+                                            hir_id: HirId(DefId(offset_of::generic).48)
                                             span: $DIR/offset_of.rs:48:5: 1440:57 (#0)
                                         }
                                     }
@@ -1033,7 +1033,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(5)
-                lint_level: Explicit(HirId(DefId(offset_of::generic).5))
+                hir_id: HirId(DefId(offset_of::generic).5)
                 value:
                     Expr {
                         ty: usize
@@ -1054,7 +1054,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(7)
-                                                lint_level: Explicit(HirId(DefId(offset_of::generic).7))
+                                                hir_id: HirId(DefId(offset_of::generic).7)
                                                 value:
                                                     Expr {
                                                         ty: usize
@@ -1116,7 +1116,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(17)
-                lint_level: Explicit(HirId(DefId(offset_of::generic).17))
+                hir_id: HirId(DefId(offset_of::generic).17)
                 value:
                     Expr {
                         ty: usize
@@ -1137,7 +1137,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(19)
-                                                lint_level: Explicit(HirId(DefId(offset_of::generic).19))
+                                                hir_id: HirId(DefId(offset_of::generic).19)
                                                 value:
                                                     Expr {
                                                         ty: usize
@@ -1199,7 +1199,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(29)
-                lint_level: Explicit(HirId(DefId(offset_of::generic).29))
+                hir_id: HirId(DefId(offset_of::generic).29)
                 value:
                     Expr {
                         ty: usize
@@ -1220,7 +1220,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(31)
-                                                lint_level: Explicit(HirId(DefId(offset_of::generic).31))
+                                                hir_id: HirId(DefId(offset_of::generic).31)
                                                 value:
                                                     Expr {
                                                         ty: usize
@@ -1282,7 +1282,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(41)
-                lint_level: Explicit(HirId(DefId(offset_of::generic).41))
+                hir_id: HirId(DefId(offset_of::generic).41)
                 value:
                     Expr {
                         ty: usize
@@ -1303,7 +1303,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(43)
-                                                lint_level: Explicit(HirId(DefId(offset_of::generic).43))
+                                                hir_id: HirId(DefId(offset_of::generic).43)
                                                 value:
                                                     Expr {
                                                         ty: usize
diff --git a/tests/ui/thir-print/thir-flat-const-variant.stdout b/tests/ui/thir-print/thir-flat-const-variant.stdout
index 750a47a7141cb..908684094ec37 100644
--- a/tests/ui/thir-print/thir-flat-const-variant.stdout
+++ b/tests/ui/thir-print/thir-flat-const-variant.stdout
@@ -17,9 +17,7 @@ Thir {
         Expr {
             kind: Scope {
                 region_scope: Node(7),
-                lint_level: Explicit(
-                    HirId(DefId(0:8 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR1).7),
-                ),
+                hir_id: HirId(DefId(0:8 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR1).7),
                 value: e0,
             },
             ty: (),
@@ -49,9 +47,7 @@ Thir {
         Expr {
             kind: Scope {
                 region_scope: Node(3),
-                lint_level: Explicit(
-                    HirId(DefId(0:8 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR1).3),
-                ),
+                hir_id: HirId(DefId(0:8 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR1).3),
                 value: e2,
             },
             ty: Foo,
@@ -82,9 +78,7 @@ Thir {
         Expr {
             kind: Scope {
                 region_scope: Node(8),
-                lint_level: Explicit(
-                    HirId(DefId(0:9 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR2).8),
-                ),
+                hir_id: HirId(DefId(0:9 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR2).8),
                 value: e0,
             },
             ty: (),
@@ -114,9 +108,7 @@ Thir {
         Expr {
             kind: Scope {
                 region_scope: Node(3),
-                lint_level: Explicit(
-                    HirId(DefId(0:9 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR2).3),
-                ),
+                hir_id: HirId(DefId(0:9 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR2).3),
                 value: e2,
             },
             ty: Foo,
@@ -147,9 +139,7 @@ Thir {
         Expr {
             kind: Scope {
                 region_scope: Node(7),
-                lint_level: Explicit(
-                    HirId(DefId(0:10 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR3).7),
-                ),
+                hir_id: HirId(DefId(0:10 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR3).7),
                 value: e0,
             },
             ty: (),
@@ -179,9 +169,7 @@ Thir {
         Expr {
             kind: Scope {
                 region_scope: Node(3),
-                lint_level: Explicit(
-                    HirId(DefId(0:10 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR3).3),
-                ),
+                hir_id: HirId(DefId(0:10 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR3).3),
                 value: e2,
             },
             ty: Foo,
@@ -212,9 +200,7 @@ Thir {
         Expr {
             kind: Scope {
                 region_scope: Node(8),
-                lint_level: Explicit(
-                    HirId(DefId(0:11 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR4).8),
-                ),
+                hir_id: HirId(DefId(0:11 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR4).8),
                 value: e0,
             },
             ty: (),
@@ -244,9 +230,7 @@ Thir {
         Expr {
             kind: Scope {
                 region_scope: Node(3),
-                lint_level: Explicit(
-                    HirId(DefId(0:11 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR4).3),
-                ),
+                hir_id: HirId(DefId(0:11 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR4).3),
                 value: e2,
             },
             ty: Foo,
@@ -286,9 +270,7 @@ Thir {
         Expr {
             kind: Scope {
                 region_scope: Node(2),
-                lint_level: Explicit(
-                    HirId(DefId(0:12 ~ thir_flat_const_variant[1f54]::main).2),
-                ),
+                hir_id: HirId(DefId(0:12 ~ thir_flat_const_variant[1f54]::main).2),
                 value: e0,
             },
             ty: (),
diff --git a/tests/ui/thir-print/thir-flat.stdout b/tests/ui/thir-print/thir-flat.stdout
index f01d64e60b3d6..37106427745ea 100644
--- a/tests/ui/thir-print/thir-flat.stdout
+++ b/tests/ui/thir-print/thir-flat.stdout
@@ -26,9 +26,7 @@ Thir {
         Expr {
             kind: Scope {
                 region_scope: Node(2),
-                lint_level: Explicit(
-                    HirId(DefId(0:3 ~ thir_flat[7b97]::main).2),
-                ),
+                hir_id: HirId(DefId(0:3 ~ thir_flat[7b97]::main).2),
                 value: e0,
             },
             ty: (),
diff --git a/tests/ui/thir-print/thir-tree-loop-match.stdout b/tests/ui/thir-print/thir-tree-loop-match.stdout
index 5f6b130c39055..4a1b2aaf67f53 100644
--- a/tests/ui/thir-print/thir-tree-loop-match.stdout
+++ b/tests/ui/thir-print/thir-tree-loop-match.stdout
@@ -32,7 +32,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(28)
-                lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).28))
+                hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).28)
                 value:
                     Expr {
                         ty: bool
@@ -53,7 +53,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(4)
-                                                lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).4))
+                                                hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).4)
                                                 value:
                                                     Expr {
                                                         ty: bool
@@ -76,7 +76,7 @@ body:
                                                                                         kind: 
                                                                                             Scope {
                                                                                                 region_scope: Node(7)
-                                                                                                lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).7))
+                                                                                                hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).7)
                                                                                                 value:
                                                                                                     Expr {
                                                                                                         ty: bool
@@ -101,7 +101,7 @@ body:
                                                                                                 kind: 
                                                                                                     Scope {
                                                                                                         region_scope: Node(12)
-                                                                                                        lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).12))
+                                                                                                        hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).12)
                                                                                                         value:
                                                                                                             Expr {
                                                                                                                 ty: bool
@@ -135,7 +135,7 @@ body:
                                                                                                         kind: 
                                                                                                             Scope {
                                                                                                                 region_scope: Node(17)
-                                                                                                                lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).17))
+                                                                                                                hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).17)
                                                                                                                 value:
                                                                                                                     Expr {
                                                                                                                         ty: bool
@@ -166,7 +166,7 @@ body:
                                                                                                                                                                     kind: 
                                                                                                                                                                         Scope {
                                                                                                                                                                             region_scope: Node(19)
-                                                                                                                                                                            lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).19))
+                                                                                                                                                                            hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).19)
                                                                                                                                                                             value:
                                                                                                                                                                                 Expr {
                                                                                                                                                                                     ty: !
@@ -183,7 +183,7 @@ body:
                                                                                                                                                                                                     kind: 
                                                                                                                                                                                                         Scope {
                                                                                                                                                                                                             region_scope: Node(20)
-                                                                                                                                                                                                            lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).20))
+                                                                                                                                                                                                            hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).20)
                                                                                                                                                                                                             value:
                                                                                                                                                                                                                 Expr {
                                                                                                                                                                                                                     ty: bool
@@ -209,7 +209,7 @@ body:
                                                                                                                     }
                                                                                                             }
                                                                                                     }
-                                                                                                lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).16))
+                                                                                                hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).16)
                                                                                                 scope: Node(16)
                                                                                                 span: $DIR/thir-tree-loop-match.rs:12:17: 15:18 (#0)
                                                                                             }
@@ -233,7 +233,7 @@ body:
                                                                                                         kind: 
                                                                                                             Scope {
                                                                                                                 region_scope: Node(25)
-                                                                                                                lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).25))
+                                                                                                                hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).25)
                                                                                                                 value:
                                                                                                                     Expr {
                                                                                                                         ty: bool
@@ -256,7 +256,7 @@ body:
                                                                                                                                                         kind: 
                                                                                                                                                             Scope {
                                                                                                                                                                 region_scope: Node(26)
-                                                                                                                                                                lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).26))
+                                                                                                                                                                hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).26)
                                                                                                                                                                 value:
                                                                                                                                                                     Expr {
                                                                                                                                                                         ty: bool
@@ -275,7 +275,7 @@ body:
                                                                                                                     }
                                                                                                             }
                                                                                                     }
-                                                                                                lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).24))
+                                                                                                hir_id: HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).24)
                                                                                                 scope: Node(24)
                                                                                                 span: $DIR/thir-tree-loop-match.rs:16:17: 16:38 (#0)
                                                                                             }
@@ -304,7 +304,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(2)
-                lint_level: Explicit(HirId(DefId(0:4 ~ thir_tree_loop_match[3c53]::main).2))
+                hir_id: HirId(DefId(0:4 ~ thir_tree_loop_match[3c53]::main).2)
                 value:
                     Expr {
                         ty: ()
diff --git a/tests/ui/thir-print/thir-tree-match.stdout b/tests/ui/thir-print/thir-tree-match.stdout
index ecc5fb21435f8..a6d23ee204cbc 100644
--- a/tests/ui/thir-print/thir-tree-match.stdout
+++ b/tests/ui/thir-print/thir-tree-match.stdout
@@ -32,7 +32,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(28)
-                lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).28))
+                hir_id: HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).28)
                 value:
                     Expr {
                         ty: bool
@@ -53,7 +53,7 @@ body:
                                         kind: 
                                             Scope {
                                                 region_scope: Node(4)
-                                                lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).4))
+                                                hir_id: HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).4)
                                                 value:
                                                     Expr {
                                                         ty: bool
@@ -69,7 +69,7 @@ body:
                                                                         kind: 
                                                                             Scope {
                                                                                 region_scope: Node(5)
-                                                                                lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).5))
+                                                                                hir_id: HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).5)
                                                                                 value:
                                                                                     Expr {
                                                                                         ty: Foo
@@ -129,7 +129,7 @@ body:
                                                                                 kind: 
                                                                                     Scope {
                                                                                         region_scope: Node(15)
-                                                                                        lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).15))
+                                                                                        hir_id: HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).15)
                                                                                         value:
                                                                                             Expr {
                                                                                                 ty: bool
@@ -141,7 +141,7 @@ body:
                                                                                             }
                                                                                     }
                                                                             }
-                                                                        lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).14))
+                                                                        hir_id: HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).14)
                                                                         scope: Node(14)
                                                                         span: $DIR/thir-tree-match.rs:17:9: 17:40 (#0)
                                                                     }
@@ -181,7 +181,7 @@ body:
                                                                                 kind: 
                                                                                     Scope {
                                                                                         region_scope: Node(21)
-                                                                                        lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).21))
+                                                                                        hir_id: HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).21)
                                                                                         value:
                                                                                             Expr {
                                                                                                 ty: bool
@@ -193,7 +193,7 @@ body:
                                                                                             }
                                                                                     }
                                                                             }
-                                                                        lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).20))
+                                                                        hir_id: HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).20)
                                                                         scope: Node(20)
                                                                         span: $DIR/thir-tree-match.rs:18:9: 18:32 (#0)
                                                                     }
@@ -225,7 +225,7 @@ body:
                                                                                 kind: 
                                                                                     Scope {
                                                                                         region_scope: Node(27)
-                                                                                        lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).27))
+                                                                                        hir_id: HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).27)
                                                                                         value:
                                                                                             Expr {
                                                                                                 ty: bool
@@ -237,7 +237,7 @@ body:
                                                                                             }
                                                                                     }
                                                                             }
-                                                                        lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).26))
+                                                                        hir_id: HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).26)
                                                                         scope: Node(26)
                                                                         span: $DIR/thir-tree-match.rs:19:9: 19:28 (#0)
                                                                     }
@@ -263,7 +263,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(2)
-                lint_level: Explicit(HirId(DefId(0:17 ~ thir_tree_match[fcf8]::main).2))
+                hir_id: HirId(DefId(0:17 ~ thir_tree_match[fcf8]::main).2)
                 value:
                     Expr {
                         ty: ()
diff --git a/tests/ui/thir-print/thir-tree.stdout b/tests/ui/thir-print/thir-tree.stdout
index d61176d6480fe..25d0ccfa7a053 100644
--- a/tests/ui/thir-print/thir-tree.stdout
+++ b/tests/ui/thir-print/thir-tree.stdout
@@ -9,7 +9,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(2)
-                lint_level: Explicit(HirId(DefId(0:3 ~ thir_tree[7aaa]::main).2))
+                hir_id: HirId(DefId(0:3 ~ thir_tree[7aaa]::main).2)
                 value:
                     Expr {
                         ty: ()
diff --git a/tests/ui/unpretty/box.stdout b/tests/ui/unpretty/box.stdout
index 54bd98c7a6834..123273be4efe5 100644
--- a/tests/ui/unpretty/box.stdout
+++ b/tests/ui/unpretty/box.stdout
@@ -9,7 +9,7 @@ body:
         kind: 
             Scope {
                 region_scope: Node(11)
-                lint_level: Explicit(HirId(DefId(0:3 ~ box[efb9]::main).11))
+                hir_id: HirId(DefId(0:3 ~ box[efb9]::main).11)
                 value:
                     Expr {
                         ty: ()
@@ -43,7 +43,7 @@ body:
                                                     kind: 
                                                         Scope {
                                                             region_scope: Node(3)
-                                                            lint_level: Explicit(HirId(DefId(0:3 ~ box[efb9]::main).3))
+                                                            hir_id: HirId(DefId(0:3 ~ box[efb9]::main).3)
                                                             value:
                                                                 Expr {
                                                                     ty: std::boxed::Box<i32, std::alloc::Global>
@@ -58,7 +58,7 @@ body:
                                                                                 kind: 
                                                                                     Scope {
                                                                                         region_scope: Node(8)
-                                                                                        lint_level: Explicit(HirId(DefId(0:3 ~ box[efb9]::main).8))
+                                                                                        hir_id: HirId(DefId(0:3 ~ box[efb9]::main).8)
                                                                                         value:
                                                                                             Expr {
                                                                                                 ty: i32
@@ -76,7 +76,7 @@ body:
                                                 }
                                             )
                                             else_block: None
-                                            lint_level: Explicit(HirId(DefId(0:3 ~ box[efb9]::main).9))
+                                            hir_id: HirId(DefId(0:3 ~ box[efb9]::main).9)
                                             span: $DIR/box.rs:7:5: 7:35 (#0)
                                         }
                                     }