Rollup of 7 pull requests

compiler/rustc_ast/src/format.rs

@@ -13,7 +13,7 @@ use crate::token::LitKind;
 //
 // format_args!("hello {abc:.xyz$}!!", abc="world");
 //                                     └─────────┘
-//                                      argument
+//                                      argument.original_span (before expansion)
 //
 // format_args!("hello {abc:.xyz$}!!", abc="world");
 //              └───────────────────┘
@@ -42,6 +42,7 @@ use crate::token::LitKind;
 /// E.g., `format_args!("hello {name}");`.
 #[derive(Clone, Encodable, Decodable, Debug, Walkable)]
 pub struct FormatArgs {
+    /// The format string literal's span (including quotes), not the whole invocation.
     pub span: Span,
     pub template: Vec<FormatArgsPiece>,
     pub arguments: FormatArguments,
@@ -145,6 +146,10 @@ impl FormatArguments {
 
 #[derive(Clone, Encodable, Decodable, Debug, Walkable)]
 pub struct FormatArgument {
+    /// The original argument span, including `name =` for named arguments, preserved across expansion.
+    /// For implicit captures, this is the identifier's span inside the format string.
+    /// Unlike `expr.span`, this still covers all of `identity!(x)` after it expands to `x`.
+    pub original_span: Span,
     pub kind: FormatArgumentKind,
     pub expr: Box<Expr>,
 }

compiler/rustc_ast/src/token.rs

@@ -969,7 +969,13 @@ impl Token {
     }
 
     pub fn is_non_reserved_ident(&self) -> bool {
-        self.ident().is_some_and(|(id, raw)| raw == IdentIsRaw::Yes || !sp::Ident::is_reserved(id))
+        self.non_reserved_ident().is_some()
+    }
+
+    pub fn non_reserved_ident(&self) -> Option<sp::Ident> {
+        self.ident()
+            .filter(|&(id, raw)| raw == IdentIsRaw::Yes || !sp::Ident::is_reserved(id))
+            .map(|(id, _)| id)
     }
 
     /// Returns `true` if the token is the identifier `true` or `false`.

compiler/rustc_ast_lowering/src/delegation/generics.rs

@@ -6,10 +6,10 @@ use rustc_ast::*;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
+use rustc_middle::ty;
 use rustc_middle::ty::{GenericParamDefKind, TyCtxt};
-use rustc_middle::{bug, ty};
 use rustc_span::symbol::kw;
-use rustc_span::{ErrorGuaranteed, Ident, Span, sym};
+use rustc_span::{ErrorGuaranteed, Ident, Span, bug, sym};
 
 use crate::LoweringContext;
 use crate::delegation::resolution::resolver::DelegationResolver;

compiler/rustc_ast_lowering/src/expr.rs

@@ -11,10 +11,11 @@ use rustc_errors::msg;
 use rustc_hir as hir;
 use rustc_hir::HirId;
 use rustc_hir::def::{DefKind, Res};
-use rustc_middle::span_bug;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::diagnostics::report_lit_error;
-use rustc_span::{ByteSymbol, DUMMY_SP, DesugaringKind, Ident, Span, Spanned, Symbol, respan, sym};
+use rustc_span::{
+    ByteSymbol, DUMMY_SP, DesugaringKind, Ident, Span, Spanned, Symbol, respan, span_bug, sym,
+};
 use thin_vec::{ThinVec, thin_vec};
 mod closure;
 

compiler/rustc_ast_lowering/src/expr/closure.rs

@@ -1,8 +1,7 @@
 use rustc_ast::*;
 use rustc_hir as hir;
 use rustc_hir::{HirId, Target, find_attr};
-use rustc_middle::span_bug;
-use rustc_span::Span;
+use rustc_span::{Span, span_bug};
 
 use super::{LoweringContext, MoveExprState};
 use crate::FnDeclKind;

compiler/rustc_ast_lowering/src/index.rs

@@ -5,9 +5,8 @@ use rustc_hir::def_id::{LocalDefId, LocalDefIdMap};
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::*;
 use rustc_index::IndexVec;
-use rustc_middle::span_bug;
 use rustc_middle::ty::TyCtxt;
-use rustc_span::{DUMMY_SP, Span};
+use rustc_span::{DUMMY_SP, Span, span_bug};
 use tracing::{debug, instrument};
 
 /// A visitor that walks over the HIR and collects `Node`s into a HIR map.

compiler/rustc_ast_lowering/src/item.rs

@@ -9,12 +9,11 @@ use rustc_hir::{
     find_attr,
 };
 use rustc_middle::middle::resolve::ResolverAstLowering;
-use rustc_middle::span_bug;
 use rustc_middle::ty::TyCtxt;
 use rustc_middle::ty::data_structures::IndexMap;
 use rustc_span::def_id::{DefId, LocalDefId};
 use rustc_span::edit_distance::find_best_match_for_name;
-use rustc_span::{DUMMY_SP, DesugaringKind, Ident, Span, Symbol, kw, sym};
+use rustc_span::{DUMMY_SP, DesugaringKind, Ident, Span, Symbol, kw, span_bug, sym};
 use smallvec::SmallVec;
 use thin_vec::ThinVec;
 use tracing::instrument;

compiler/rustc_ast_lowering/src/lib.rs

@@ -69,11 +69,10 @@ use rustc_middle::middle::resolve::{
     AstOwner, LifetimeRes, PartialRes, PerOwnerResolverData, ResolverAstLowering,
 };
 use rustc_middle::queries::Providers;
-use rustc_middle::span_bug;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::diagnostics::add_feature_diagnostics;
 use rustc_span::symbol::{Ident, Symbol, kw, sym};
-use rustc_span::{DUMMY_SP, DesugaringKind, Span};
+use rustc_span::{DUMMY_SP, DesugaringKind, Span, span_bug};
 use smallvec::{SmallVec, smallvec};
 use thin_vec::ThinVec;
 use tracing::{debug, instrument, trace};

compiler/rustc_ast_lowering/src/pat.rs

@@ -4,8 +4,7 @@ use rustc_ast::*;
 use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::{self as hir, Target};
-use rustc_middle::span_bug;
-use rustc_span::{DesugaringKind, Ident, Span, Spanned, respan};
+use rustc_span::{DesugaringKind, Ident, Span, Spanned, respan, span_bug};
 
 use crate::diagnostics::{
     ArbitraryExpressionInPattern, ExtraDoubleDot, MisplacedDoubleDot, SubTupleBinding,

compiler/rustc_ast_lowering/src/path.rs

@@ -6,9 +6,9 @@ use rustc_hir::def::{DefKind, PerNS, Res};
 use rustc_hir::def_id::DefId;
 use rustc_hir::{self as hir, GenericArg};
 use rustc_middle::middle::resolve::PartialRes;
-use rustc_middle::{span_bug, ty};
+use rustc_middle::ty;
 use rustc_session::diagnostics::add_feature_diagnostics;
-use rustc_span::{BytePos, DUMMY_SP, DesugaringKind, Ident, Span, Symbol, sym};
+use rustc_span::{BytePos, DUMMY_SP, DesugaringKind, Ident, Span, Symbol, span_bug, sym};
 use smallvec::smallvec;
 use tracing::{debug, instrument};
 

compiler/rustc_borrowck/src/borrow_set.rs

@@ -8,10 +8,11 @@ use rustc_index::IndexVec;
 use rustc_index::bit_set::DenseBitSet;
 use rustc_middle::mir::visit::{MutatingUseContext, NonUseContext, PlaceContext, Visitor};
 use rustc_middle::mir::{self, Body, Local, Location, PlaceElem, traversal};
+use rustc_middle::ty;
 use rustc_middle::ty::data_structures::IndexSet;
 use rustc_middle::ty::{RegionVid, TyCtxt};
-use rustc_middle::{bug, span_bug, ty};
 use rustc_mir_dataflow::move_paths::MoveData;
+use rustc_span::{bug, span_bug};
 use smallvec::{SmallVec, smallvec};
 use tracing::debug;
 

compiler/rustc_borrowck/src/borrowck_errors.rs

@@ -1,9 +1,8 @@
 use rustc_errors::codes::*;
 use rustc_errors::{Applicability, Diag, DiagCtxtHandle, struct_span_code_err};
 use rustc_hir as hir;
-use rustc_middle::span_bug;
 use rustc_middle::ty::{self, Ty};
-use rustc_span::Span;
+use rustc_span::{Span, span_bug};
 
 impl<'diag, 'tcx> crate::MirBorrowckCtxt<'_, 'diag, 'tcx> {
     pub(crate) fn dcx(&self) -> DiagCtxtHandle<'diag> {

compiler/rustc_borrowck/src/consumers.rs

@@ -3,9 +3,9 @@
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def_id::LocalDefId;
 use rustc_index::IndexVec;
-use rustc_middle::bug;
 use rustc_middle::mir::{Body, Promoted};
 use rustc_middle::ty::TyCtxt;
+use rustc_span::bug;
 
 pub use super::borrow_set::{BorrowData, BorrowSet, TwoPhaseActivation};
 pub use super::constraints::OutlivesConstraint;

compiler/rustc_borrowck/src/def_use.rs

@@ -1,7 +1,7 @@
-use rustc_middle::bug;
 use rustc_middle::mir::visit::{
     MutatingUseContext, NonMutatingUseContext, NonUseContext, PlaceContext,
 };
+use rustc_span::bug;
 
 #[derive(Eq, PartialEq, Clone)]
 pub(crate) enum DefUse {

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -16,7 +16,6 @@ use rustc_hir::intravisit::{Visitor, walk_block, walk_expr};
 use rustc_hir::{CoroutineDesugaring, CoroutineKind, CoroutineSource, PatField, find_attr};
 use rustc_index::bit_set::DenseBitSet;
 use rustc_infer::traits::TraitErrors;
-use rustc_middle::bug;
 use rustc_middle::hir::nested_filter::OnlyBodies;
 use rustc_middle::mir::{
     self, AggregateKind, BindingForm, BorrowKind, ClearCrossCrate, ConstraintCategory,
@@ -32,7 +31,7 @@ use rustc_middle::ty::{
 use rustc_mir_dataflow::move_paths::{Init, InitKind, InitLocation, MoveOutIndex, MovePathIndex};
 use rustc_span::def_id::{DefId, LocalDefId};
 use rustc_span::hygiene::DesugaringKind;
-use rustc_span::{BytePos, ExpnKind, Ident, MacroKind, Span, Symbol, kw, sym};
+use rustc_span::{BytePos, ExpnKind, Ident, MacroKind, Span, Symbol, bug, kw, sym};
 use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
 use rustc_trait_selection::error_reporting::traits::FindExprBySpan;
 use rustc_trait_selection::error_reporting::traits::call_kind::CallKind;

compiler/rustc_borrowck/src/diagnostics/mod.rs

@@ -21,10 +21,9 @@ use rustc_middle::mir::{
 };
 use rustc_middle::ty::print::{Print, with_no_trimmed_paths};
 use rustc_middle::ty::{self, Ty, TyCtxt};
-use rustc_middle::{bug, span_bug};
 use rustc_mir_dataflow::move_paths::{InitLocation, LookupResult, MoveOutIndex};
 use rustc_span::def_id::LocalDefId;
-use rustc_span::{DUMMY_SP, Span, Spanned, Symbol, sym};
+use rustc_span::{DUMMY_SP, Span, Spanned, Symbol, bug, span_bug, sym};
 use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
 use rustc_trait_selection::error_reporting::traits::call_kind::{CallDesugaringKind, call_kind};
 use rustc_trait_selection::infer::InferCtxtExt;

compiler/rustc_borrowck/src/diagnostics/move_errors.rs

@@ -3,12 +3,11 @@ use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::{Applicability, Diag};
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::{self as hir, CaptureBy, ExprKind, HirId, Node};
-use rustc_middle::bug;
 use rustc_middle::mir::*;
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_mir_dataflow::move_paths::{LookupResult, MovePathIndex};
 use rustc_span::def_id::DefId;
-use rustc_span::{BytePos, ExpnKind, MacroKind, Span, sym};
+use rustc_span::{BytePos, ExpnKind, MacroKind, Span, bug, sym};
 use rustc_trait_selection::error_reporting::traits::FindExprBySpan;
 use rustc_trait_selection::infer::InferCtxtExt;
 use tracing::debug;

compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

@@ -8,7 +8,6 @@ use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::{self as hir, BindingMode, ByRef, Expr, Node};
-use rustc_middle::bug;
 use rustc_middle::hir::place::PlaceBase;
 use rustc_middle::mir::visit::PlaceContext;
 use rustc_middle::mir::{
@@ -17,7 +16,7 @@ use rustc_middle::mir::{
     StatementKind, TerminatorKind,
 };
 use rustc_middle::ty::{self, InstanceKind, Ty, TyCtxt, Upcast};
-use rustc_span::{BytePos, DesugaringKind, Span, Symbol, kw, sym};
+use rustc_span::{BytePos, DesugaringKind, Span, Symbol, bug, kw, sym};
 use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
 use rustc_trait_selection::infer::InferCtxtExt;
 use rustc_trait_selection::traits;

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

@@ -11,13 +11,12 @@ use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::{PolyTraitRef, TyKind, WhereBoundPredicate};
 use rustc_infer::infer::{NllRegionVariableOrigin, SubregionOrigin};
-use rustc_middle::bug;
 use rustc_middle::hir::place::PlaceBase;
 use rustc_middle::mir::{AnnotationSource, ConstraintCategory, ReturnConstraint};
 use rustc_middle::ty::{
     self, GenericArgs, Region, RegionVid, Ty, TyCtxt, TypeFoldable, TypeVisitor, fold_regions,
 };
-use rustc_span::{Ident, Span, kw};
+use rustc_span::{Ident, Span, bug, kw};
 use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
 use rustc_trait_selection::error_reporting::infer::nice_region_error::{
     self, HirTraitObjectVisitor, NiceRegionError, TraitObjectVisitor, find_anon_type,

compiler/rustc_borrowck/src/diagnostics/region_name.rs

@@ -7,8 +7,7 @@ use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
 use rustc_middle::ty::print::RegionHighlightMode;
 use rustc_middle::ty::{self, GenericArgKind, GenericArgsRef, RegionVid, Ty, Unnormalized};
-use rustc_middle::{bug, span_bug};
-use rustc_span::{DUMMY_SP, Span, Symbol, kw, sym};
+use rustc_span::{DUMMY_SP, Span, Symbol, bug, kw, span_bug, sym};
 use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
 use tracing::{debug, instrument};
 

compiler/rustc_borrowck/src/lib.rs

@@ -41,14 +41,13 @@ use rustc_middle::query::Providers;
 use rustc_middle::ty::{
     self, ParamEnv, RegionVid, Ty, TyCtxt, TypeFoldable, TypeVisitable, TypingMode, fold_regions,
 };
-use rustc_middle::{bug, span_bug};
 use rustc_mir_dataflow::impls::{EverInitializedPlaces, MaybeUninitializedPlaces};
 use rustc_mir_dataflow::move_paths::{
     InitIndex, InitLocation, LookupResult, MoveData, MovePathIndex,
 };
 use rustc_mir_dataflow::points::DenseLocationMap;
 use rustc_mir_dataflow::{Analysis, EntryStates, Results, ResultsVisitor, visit_results};
-use rustc_span::{ErrorGuaranteed, Span, Symbol};
+use rustc_span::{ErrorGuaranteed, Span, Symbol, bug, span_bug};
 use rustc_trait_selection::traits::query::type_op::{QueryTypeOp, TypeOp, TypeOpOutput};
 use smallvec::SmallVec;
 use tracing::{debug, instrument};

compiler/rustc_borrowck/src/places_conflict.rs

@@ -54,11 +54,11 @@ use std::cmp::max;
 use std::iter;
 
 use rustc_hir as hir;
-use rustc_middle::bug;
 use rustc_middle::mir::{
     Body, BorrowKind, FakeBorrowKind, MutBorrowKind, Place, PlaceElem, PlaceRef, ProjectionElem,
 };
 use rustc_middle::ty::{self, TyCtxt};
+use rustc_span::bug;
 use tracing::{debug, instrument};
 
 use crate::{AccessDepth, ArtificialField, Deep, Overlap, Shallow};

compiler/rustc_borrowck/src/polonius/legacy/loan_invalidations.rs

@@ -1,10 +1,10 @@
 use std::ops::ControlFlow;
 
 use rustc_data_structures::graph::dominators::Dominators;
-use rustc_middle::bug;
 use rustc_middle::mir::visit::Visitor;
 use rustc_middle::mir::*;
 use rustc_middle::ty::TyCtxt;
+use rustc_span::bug;
 use tracing::debug;
 
 use super::{PoloniusFacts, PoloniusLocationTable};

compiler/rustc_borrowck/src/region_infer/mod.rs

@@ -11,7 +11,6 @@ use rustc_index::IndexVec;
 use rustc_infer::infer::outlives::test_type_match;
 use rustc_infer::infer::region_constraints::{GenericKind, VerifyBound, VerifyIfEq};
 use rustc_infer::infer::{InferCtxt, NllRegionVariableOrigin};
-use rustc_middle::bug;
 use rustc_middle::mir::{
     AnnotationSource, BasicBlock, Body, ConstraintCategory, Local, Location, ReturnConstraint,
     TerminatorKind,
@@ -20,7 +19,7 @@ use rustc_middle::traits::{ObligationCause, ObligationCauseCode};
 use rustc_middle::ty::{self, RegionVid, Ty, TyCtxt, TypeFoldable, UniverseIndex, fold_regions};
 use rustc_mir_dataflow::points::DenseLocationMap;
 use rustc_span::hygiene::DesugaringKind;
-use rustc_span::{DUMMY_SP, Span};
+use rustc_span::{DUMMY_SP, Span, bug};
 use tracing::{Level, debug, enabled, instrument, trace};
 
 use crate::constraints::graph::NormalConstraintGraph;

compiler/rustc_borrowck/src/region_infer/opaque_types/member_constraints.rs

@@ -1,10 +1,10 @@
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def_id::DefId;
-use rustc_middle::bug;
 use rustc_middle::ty::{
     self, Flags, GenericArgsRef, Region, RegionVid, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable,
     TypeVisitor,
 };
+use rustc_span::bug;
 use tracing::{debug, instrument};
 
 use super::DefiningUse;

compiler/rustc_borrowck/src/region_infer/values.rs

@@ -5,10 +5,10 @@ use rustc_data_structures::fx::{FxHashSet, FxIndexSet};
 use rustc_index::Idx;
 use rustc_index::bit_set::SparseBitMatrix;
 use rustc_index::interval::{IntervalSet, SparseIntervalMatrix};
-use rustc_middle::bug;
 use rustc_middle::mir::{BasicBlock, Location};
 use rustc_middle::ty::{self, RegionVid};
 use rustc_mir_dataflow::points::{DenseLocationMap, PointIndex};
+use rustc_span::bug;
 use tracing::{debug, instrument};
 
 use crate::BorrowIndex;

compiler/rustc_borrowck/src/type_check/canonical.rs

@@ -3,11 +3,10 @@ use std::fmt;
 use rustc_errors::ErrorGuaranteed;
 use rustc_infer::infer::canonical::Canonical;
 use rustc_infer::infer::outlives::env::RegionBoundPairs;
-use rustc_middle::bug;
 use rustc_middle::mir::{Body, ConstraintCategory};
 use rustc_middle::ty::{self, Ty, TyCtxt, TypeFoldable, Unnormalized, Upcast};
-use rustc_span::Span;
 use rustc_span::def_id::DefId;
+use rustc_span::{Span, bug};
 use rustc_trait_selection::traits::ObligationCause;
 use rustc_trait_selection::traits::query::type_op::{self, TypeOpOutput};
 use tracing::{debug, instrument};

compiler/rustc_borrowck/src/type_check/liveness/mod.rs

@@ -2,11 +2,11 @@ use itertools::{Either, Itertools};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_middle::mir::visit::{TyContext, Visitor};
 use rustc_middle::mir::{Body, Local, Location, SourceInfo};
-use rustc_middle::span_bug;
 use rustc_middle::ty::relate::Relate;
 use rustc_middle::ty::{GenericArgsRef, Region, RegionVid, Ty, TyCtxt, TypeVisitable};
 use rustc_mir_dataflow::move_paths::MoveData;
 use rustc_mir_dataflow::points::DenseLocationMap;
+use rustc_span::span_bug;
 use tracing::debug;
 
 use super::TypeChecker;

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -19,7 +19,6 @@ use rustc_infer::infer::{
     BoundRegionConversionTime, InferCtxt, NllRegionVariableOrigin, RegionVariableOrigin,
 };
 use rustc_infer::traits::{Obligation, ObligationCause, PredicateObligations};
-use rustc_middle::bug;
 use rustc_middle::mir::visit::{NonMutatingUseContext, PlaceContext, Visitor};
 use rustc_middle::mir::*;
 use rustc_middle::traits::query::NoSolution;
@@ -32,7 +31,7 @@ use rustc_middle::ty::{
 use rustc_mir_dataflow::move_paths::MoveData;
 use rustc_mir_dataflow::points::DenseLocationMap;
 use rustc_span::def_id::CRATE_DEF_ID;
-use rustc_span::{Span, Spanned, sym};
+use rustc_span::{Span, Spanned, bug, sym};
 use rustc_trait_selection::infer::InferCtxtExt;
 use rustc_trait_selection::traits::query::type_op::custom::scrape_region_constraints;
 use rustc_trait_selection::traits::query::type_op::{self, TypeOp, TypeOpOutput};