Auto merge of #148100 - matthiaskrgr:rollup-vrd4wy8, r=matthiaskrgr

Rollup of 4 pull requests Successful merges: - #143361 (Stop passing resolver disambiguator state to AST lowering.) - #148000 (Improvements to attribute suggestions) - #148007 (chore: Update to the latest annotate-snippets) - #148088 (compiletest: Simplify passing arguments to spawned test threads) r? `@ghost` `@rustbot` modify labels: rollup

Author: bors

Cargo.lock

@@ -75,7 +75,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4"
 dependencies = [
  "anstyle",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
+]
+
+[[package]]
+name = "annotate-snippets"
+version = "0.12.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47224528f74de27d1d06aad6a5dda4f865b6ebe2e56c538943d746a7270cb67e"
+dependencies = [
+ "anstyle",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -136,7 +146,7 @@ dependencies = [
  "anstyle-lossy",
  "anstyle-parse",
  "html-escape",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -677,7 +687,7 @@ checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
 dependencies = [
  "serde",
  "termcolor",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -808,7 +818,7 @@ dependencies = [
  "encode_unicode",
  "libc",
  "once_cell",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
  "windows-sys 0.59.0",
 ]
 
@@ -1485,7 +1495,7 @@ version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df"
 dependencies = [
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -1887,7 +1897,7 @@ dependencies = [
  "console",
  "number_prefix",
  "portable-atomic",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
  "web-time",
 ]
 
@@ -3756,7 +3766,7 @@ dependencies = [
 name = "rustc_errors"
 version = "0.0.0"
 dependencies = [
- "annotate-snippets 0.11.5",
+ "annotate-snippets 0.12.7",
  "anstream",
  "anstyle",
  "derive_setters",
@@ -4331,7 +4341,7 @@ dependencies = [
  "thin-vec",
  "tracing",
  "unicode-normalization",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -4590,7 +4600,7 @@ dependencies = [
  "sha1",
  "sha2",
  "tracing",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -5936,9 +5946,9 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unicode-xid"
@@ -6223,7 +6233,7 @@ dependencies = [
  "bumpalo",
  "leb128fmt",
  "memchr",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
  "wasm-encoder 0.240.0",
 ]
 

compiler/rustc_ast_lowering/src/expr.rs

@@ -7,6 +7,7 @@ use rustc_data_structures::stack::ensure_sufficient_stack;
 use rustc_hir as hir;
 use rustc_hir::attrs::AttributeKind;
 use rustc_hir::def::{DefKind, Res};
+use rustc_hir::definitions::DefPathData;
 use rustc_hir::{HirId, Target, find_attr};
 use rustc_middle::span_bug;
 use rustc_middle::ty::TyCtxt;
@@ -461,7 +462,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
  for (idx, arg) in args.iter().cloned().enumerate() {
  if legacy_args_idx.contains(&idx) {
  let node_id = self.next_node_id();
- self.create_def(node_id, None, DefKind::AnonConst, f.span);
+ self.create_def(
+ node_id,
+ None,
+ DefKind::AnonConst,
+ DefPathData::LateAnonConst,
+ f.span,
+ );
  let mut visitor = WillCreateDefIdsVisitor {};
  let const_value = if let ControlFlow::Break(span) = visitor.visit_expr(&arg) {
  Box::new(Expr {

compiler/rustc_ast_lowering/src/lib.rs

@@ -51,6 +51,7 @@ use rustc_data_structures::tagged_ptr::TaggedRef;
 use rustc_errors::{DiagArgFromDisplay, DiagCtxtHandle};
 use rustc_hir::def::{DefKind, LifetimeRes, Namespace, PartialRes, PerNS, Res};
 use rustc_hir::def_id::{CRATE_DEF_ID, LOCAL_CRATE, LocalDefId};
+use rustc_hir::definitions::{DefPathData, DisambiguatorState};
 use rustc_hir::lints::DelayedLint;
 use rustc_hir::{
  self as hir, AngleBrackets, ConstArg, GenericArg, HirId, ItemLocalMap, LifetimeSource,
@@ -93,6 +94,7 @@ rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
 struct LoweringContext<'a, 'hir> {
  tcx: TyCtxt<'hir>,
  resolver: &'a mut ResolverAstLowering,
+ disambiguator: DisambiguatorState,
 
  /// Used to allocate HIR nodes.
  arena: &'hir hir::Arena<'hir>,
@@ -155,6 +157,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  // Pseudo-globals.
  tcx,
  resolver,
+ disambiguator: DisambiguatorState::new(),
  arena: tcx.hir_arena,
 
  // HirId handling.
@@ -546,6 +549,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  node_id: ast::NodeId,
  name: Option<Symbol>,
  def_kind: DefKind,
+ def_path_data: DefPathData,
  span: Span,
  ) -> LocalDefId {
  let parent = self.current_hir_id_owner.def_id;
@@ -561,7 +565,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  let def_id = self
  .tcx
  .at(span)
- .create_def(parent, name, def_kind, None, &mut self.resolver.disambiguator)
+ .create_def(parent, name, def_kind, Some(def_path_data), &mut self.disambiguator)
  .def_id();
 
  debug!("create_def: def_id_to_node_id[{:?}] <-> {:?}", def_id, node_id);
@@ -846,6 +850,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  param,
  Some(kw::UnderscoreLifetime),
  DefKind::LifetimeParam,
+ DefPathData::DesugaredAnonymousLifetime,
  ident.span,
  );
  debug!(?_def_id);
@@ -2290,7 +2295,13 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  // We're lowering a const argument that was originally thought to be a type argument,
  // so the def collector didn't create the def ahead of time. That's why we have to do
  // it here.
- let def_id = self.create_def(node_id, None, DefKind::AnonConst, span);
+ let def_id = self.create_def(
+ node_id,
+ None,
+ DefKind::AnonConst,
+ DefPathData::LateAnonConst,
+ span,
+ );
  let hir_id = self.lower_node_id(node_id);
 
  let path_expr = Expr {

compiler/rustc_ast_lowering/src/pat.rs

@@ -3,6 +3,7 @@ use std::sync::Arc;
 use rustc_ast::*;
 use rustc_data_structures::stack::ensure_sufficient_stack;
 use rustc_hir::def::{DefKind, Res};
+use rustc_hir::definitions::DefPathData;
 use rustc_hir::{self as hir, LangItem, Target};
 use rustc_middle::span_bug;
 use rustc_span::source_map::{Spanned, respan};
@@ -527,7 +528,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  // We're generating a range end that didn't exist in the AST,
  // so the def collector didn't create the def ahead of time. That's why we have to do
  // it here.
- let def_id = self.create_def(node_id, None, DefKind::AnonConst, span);
+ let def_id =
+ self.create_def(node_id, None, DefKind::AnonConst, DefPathData::LateAnonConst, span);
  let hir_id = self.lower_node_id(node_id);
 
  let unstable_span = self.mark_span_with_reason(

compiler/rustc_attr_parsing/src/attributes/cfg.rs

@@ -326,7 +326,8 @@ pub fn parse_cfg_attr(
  }) {
  Ok(r) => return Some(r),
  Err(e) => {
- let suggestions = CFG_ATTR_TEMPLATE.suggestions(cfg_attr.style, sym::cfg_attr);
+ let suggestions =
+ CFG_ATTR_TEMPLATE.suggestions(Some(cfg_attr.style), sym::cfg_attr);
  e.with_span_suggestions(
  cfg_attr.span,
  "must be of the form",
@@ -356,7 +357,7 @@ pub fn parse_cfg_attr(
  template: CFG_ATTR_TEMPLATE,
  attribute: AttrPath::from_ast(&cfg_attr.get_normal_item().path),
  reason,
- attr_style: cfg_attr.style,
+ suggestions: CFG_ATTR_TEMPLATE.suggestions(Some(cfg_attr.style), sym::cfg_attr),
  });
  }
  }
@@ -388,6 +389,7 @@ fn parse_cfg_attr_internal<'a>(
  let cfg_predicate = AttributeParser::parse_single_args(
  sess,
  attribute.span,
+ attribute.get_normal_item().span(),
  attribute.style,
  AttrPath {
  segments: attribute

compiler/rustc_attr_parsing/src/attributes/inline.rs

@@ -56,8 +56,7 @@ impl<S: Stage> SingleAttributeParser<S> for InlineParser {
  }
  }
  ArgParser::NameValue(_) => {
- let suggestions = <Self as SingleAttributeParser<S>>::TEMPLATE
- .suggestions(cx.attr_style, "inline");
+ let suggestions = cx.suggestions();
  let span = cx.attr_span;
  cx.emit_lint(AttributeLintKind::IllFormedAttributeInput { suggestions }, span);
  return None;

compiler/rustc_attr_parsing/src/attributes/link_attrs.rs

@@ -71,8 +71,7 @@ impl<S: Stage> CombineAttributeParser<S> for LinkParser {
  // Specifically `#[link = "dl"]` is accepted with a FCW
  // For more information, see https://github.com/rust-lang/rust/pull/143193
  ArgParser::NameValue(nv) if nv.value_as_str().is_some_and(|v| v == sym::dl) => {
- let suggestions = <Self as CombineAttributeParser<S>>::TEMPLATE
- .suggestions(cx.attr_style, "link");
+ let suggestions = cx.suggestions();
  let span = cx.attr_span;
  cx.emit_lint(AttributeLintKind::IllFormedAttributeInput { suggestions }, span);
  return None;

compiler/rustc_attr_parsing/src/attributes/macro_attrs.rs

@@ -1,4 +1,3 @@
-use rustc_ast::AttrStyle;
 use rustc_errors::DiagArgValue;
 use rustc_hir::attrs::MacroUseArgs;
 
@@ -102,7 +101,7 @@ impl<S: Stage> AttributeParser<S> for MacroUseParser {
  }
  }
  ArgParser::NameValue(_) => {
- let suggestions = MACRO_USE_TEMPLATE.suggestions(cx.attr_style, sym::macro_use);
+ let suggestions = cx.suggestions();
  cx.emit_err(IllFormedAttributeInputLint {
  num_suggestions: suggestions.len(),
  suggestions: DiagArgValue::StrListSepByAnd(
@@ -149,19 +148,14 @@ impl<S: Stage> SingleAttributeParser<S> for MacroExportParser {
  ]);
 
  fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
- let suggestions = || {
- <Self as SingleAttributeParser<S>>::TEMPLATE
- .suggestions(AttrStyle::Inner, "macro_export")
- };
  let local_inner_macros = match args {
  ArgParser::NoArgs => false,
  ArgParser::List(list) => {
  let Some(l) = list.single() else {
  let span = cx.attr_span;
+ let suggestions = cx.suggestions();
  cx.emit_lint(
- AttributeLintKind::InvalidMacroExportArguments {
- suggestions: suggestions(),
- },
+ AttributeLintKind::InvalidMacroExportArguments { suggestions },
  span,
  );
  return None;
@@ -170,10 +164,9 @@ impl<S: Stage> SingleAttributeParser<S> for MacroExportParser {
  Some(sym::local_inner_macros) => true,
  _ => {
  let span = cx.attr_span;
+ let suggestions = cx.suggestions();
  cx.emit_lint(
- AttributeLintKind::InvalidMacroExportArguments {
- suggestions: suggestions(),
- },
+ AttributeLintKind::InvalidMacroExportArguments { suggestions },
  span,
  );
  return None;
@@ -182,7 +175,7 @@ impl<S: Stage> SingleAttributeParser<S> for MacroExportParser {
  }
  ArgParser::NameValue(_) => {
  let span = cx.attr_span;
- let suggestions = suggestions();
+ let suggestions = cx.suggestions();
  cx.emit_err(IllFormedAttributeInputLint {
  num_suggestions: suggestions.len(),
  suggestions: DiagArgValue::StrListSepByAnd(

compiler/rustc_attr_parsing/src/attributes/must_use.rs

@@ -45,8 +45,7 @@ impl<S: Stage> SingleAttributeParser<S> for MustUseParser {
  Some(value_str)
  }
  ArgParser::List(_) => {
- let suggestions = <Self as SingleAttributeParser<S>>::TEMPLATE
- .suggestions(cx.attr_style, "must_use");
+ let suggestions = cx.suggestions();
  cx.emit_err(IllFormedAttributeInputLint {
  num_suggestions: suggestions.len(),
  suggestions: DiagArgValue::StrListSepByAnd(

compiler/rustc_attr_parsing/src/attributes/test_attrs.rs

@@ -20,8 +20,7 @@ impl<S: Stage> SingleAttributeParser<S> for IgnoreParser {
  ArgParser::NoArgs => None,
  ArgParser::NameValue(name_value) => {
  let Some(str_value) = name_value.value_as_str() else {
- let suggestions = <Self as SingleAttributeParser<S>>::TEMPLATE
- .suggestions(cx.attr_style, "ignore");
+ let suggestions = cx.suggestions();
  let span = cx.attr_span;
  cx.emit_lint(
  AttributeLintKind::IllFormedAttributeInput { suggestions },
@@ -32,8 +31,7 @@ impl<S: Stage> SingleAttributeParser<S> for IgnoreParser {
  Some(str_value)
  }
  ArgParser::List(_) => {
- let suggestions = <Self as SingleAttributeParser<S>>::TEMPLATE
- .suggestions(cx.attr_style, "ignore");
+ let suggestions = cx.suggestions();
  let span = cx.attr_span;
  cx.emit_lint(AttributeLintKind::IllFormedAttributeInput { suggestions }, span);
  return None;