Remove target arguments from parse_limited

JonathanBrouwer · JonathanBrouwer · commit 7881f786d0b2 · 2026-04-17T16:51:10.000+02:00
diff --git a/compiler/rustc_ast_passes/src/feature_gate.rs b/compiler/rustc_ast_passes/src/feature_gate.rs
@@ -7,7 +7,7 @@ use rustc_hir::Attribute;
 use rustc_hir::attrs::AttributeKind;
 use rustc_session::Session;
 use rustc_session::parse::{feature_err, feature_warn};
-use rustc_span::{DUMMY_SP, Span, Spanned, Symbol, sym};
+use rustc_span::{Span, Spanned, Symbol, sym};
 use thin_vec::ThinVec;
 
 use crate::errors;
@@ -646,14 +646,7 @@ fn maybe_stage_features(sess: &Session, features: &Features, krate: &ast::Crate)
     let mut errored = false;
 
     if let Some(Attribute::Parsed(AttributeKind::Feature(feature_idents, first_span))) =
-        AttributeParser::parse_limited(
-            sess,
-            &krate.attrs,
-            sym::feature,
-            DUMMY_SP,
-            krate.id,
-            Some(&features),
-        )
+        AttributeParser::parse_limited(sess, &krate.attrs, sym::feature, Some(&features))
     {
         // `feature(...)` used on non-nightly. This is definitely an error.
         let mut err = errors::FeatureOnNonNightly {
diff --git a/compiler/rustc_attr_parsing/src/interface.rs b/compiler/rustc_attr_parsing/src/interface.rs
@@ -2,7 +2,7 @@ use std::convert::identity;
 
 use rustc_ast as ast;
 use rustc_ast::token::DocFragmentKind;
-use rustc_ast::{AttrItemKind, AttrStyle, NodeId, Safety};
+use rustc_ast::{AttrItemKind, AttrStyle, CRATE_NODE_ID, NodeId, Safety};
 use rustc_data_structures::fx::FxIndexSet;
 use rustc_errors::DiagCtxtHandle;
 use rustc_feature::{AttributeTemplate, Features};
@@ -54,16 +54,15 @@ impl<'sess> AttributeParser<'sess, Early> {
         sess: &'sess Session,
         attrs: &[ast::Attribute],
         sym: Symbol,
-        target_span: Span,
-        target_node_id: NodeId,
         features: Option<&'sess Features>,
     ) -> Option<Attribute> {
         Self::parse_limited_should_emit(
             sess,
             attrs,
             sym,
-            target_span,
-            target_node_id,
+            // Because we're not emitting warnings/errors, the target span & id should not matter
+            DUMMY_SP,
+            CRATE_NODE_ID,
             features,
             ShouldEmit::Nothing,
         )
diff --git a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs
@@ -493,7 +493,7 @@ impl<'a> TraitDef<'a> {
         match item {
             Annotatable::Item(item) => {
                 let is_packed = matches!(
-                    AttributeParser::parse_limited(cx.sess, &item.attrs, sym::repr, item.span, item.id, None),
+                    AttributeParser::parse_limited(cx.sess, &item.attrs, sym::repr, None),
                     Some(Attribute::Parsed(AttributeKind::Repr { reprs, .. })) if reprs.iter().any(|(x, _)| matches!(x, ReprPacked(..)))
                 );
 
diff --git a/compiler/rustc_builtin_macros/src/proc_macro_harness.rs b/compiler/rustc_builtin_macros/src/proc_macro_harness.rs
@@ -1,7 +1,7 @@
 use std::{mem, slice};
 
 use rustc_ast::visit::{self, Visitor};
-use rustc_ast::{self as ast, HasNodeId, NodeId, attr};
+use rustc_ast::{self as ast, NodeId, attr};
 use rustc_ast_pretty::pprust;
 use rustc_attr_parsing::AttributeParser;
 use rustc_errors::DiagCtxtHandle;
@@ -109,8 +109,6 @@ impl<'a> CollectProcMacros<'a> {
             self.session,
             slice::from_ref(attr),
             sym::proc_macro_derive,
-            item.span,
-            item.node_id(),
             None,
         )
         else {
diff --git a/compiler/rustc_builtin_macros/src/test.rs b/compiler/rustc_builtin_macros/src/test.rs
@@ -3,7 +3,7 @@
 
 use std::{assert_matches, iter};
 
-use rustc_ast::{self as ast, GenericParamKind, HasNodeId, attr, join_path_idents};
+use rustc_ast::{self as ast, GenericParamKind, attr, join_path_idents};
 use rustc_ast_pretty::pprust;
 use rustc_attr_parsing::AttributeParser;
 use rustc_errors::{Applicability, Diag, Level};
@@ -480,14 +480,7 @@ fn should_ignore_message(i: &ast::Item) -> Option<Symbol> {
 
 fn should_panic(cx: &ExtCtxt<'_>, i: &ast::Item) -> ShouldPanic {
     if let Some(Attribute::Parsed(AttributeKind::ShouldPanic { reason, .. })) =
-        AttributeParser::parse_limited(
-            cx.sess,
-            &i.attrs,
-            sym::should_panic,
-            i.span,
-            i.node_id(),
-            None,
-        )
+        AttributeParser::parse_limited(cx.sess, &i.attrs, sym::should_panic, None)
     {
         ShouldPanic::Yes(reason)
     } else {
diff --git a/compiler/rustc_builtin_macros/src/test_harness.rs b/compiler/rustc_builtin_macros/src/test_harness.rs
@@ -388,14 +388,7 @@ fn get_test_name(i: &ast::Item) -> Option<Symbol> {
 }
 
 fn get_test_runner(sess: &Session, features: &Features, krate: &ast::Crate) -> Option<ast::Path> {
-    match AttributeParser::parse_limited(
-        sess,
-        &krate.attrs,
-        sym::test_runner,
-        krate.spans.inner_span,
-        krate.id,
-        Some(features),
-    ) {
+    match AttributeParser::parse_limited(sess, &krate.attrs, sym::test_runner, Some(features)) {
         Some(rustc_hir::Attribute::Parsed(AttributeKind::TestRunner(path))) => Some(path),
         _ => None,
     }
diff --git a/compiler/rustc_expand/src/config.rs b/compiler/rustc_expand/src/config.rs
@@ -7,8 +7,8 @@ use rustc_ast::tokenstream::{
     AttrTokenStream, AttrTokenTree, LazyAttrTokenStream, Spacing, TokenTree,
 };
 use rustc_ast::{
-    self as ast, AttrItemKind, AttrKind, AttrStyle, Attribute, DUMMY_NODE_ID, EarlyParsedAttribute,
-    HasAttrs, HasTokens, MetaItem, MetaItemInner, NodeId, NormalAttr,
+    self as ast, AttrItemKind, AttrKind, AttrStyle, Attribute, EarlyParsedAttribute, HasAttrs,
+    HasTokens, MetaItem, MetaItemInner, NodeId, NormalAttr,
 };
 use rustc_attr_parsing::parser::AllowExprMetavar;
 use rustc_attr_parsing::{
@@ -28,7 +28,7 @@ use rustc_hir::{
 use rustc_parse::parser::Recovery;
 use rustc_session::Session;
 use rustc_session::parse::feature_err;
-use rustc_span::{DUMMY_SP, STDLIB_STABLE_CRATES, Span, Symbol, sym};
+use rustc_span::{STDLIB_STABLE_CRATES, Span, Symbol, sym};
 use tracing::instrument;
 
 use crate::errors::{
@@ -51,14 +51,7 @@ pub fn features(sess: &Session, krate_attrs: &[Attribute], crate_name: Symbol) -
     let mut features = Features::default();
 
     if let Some(hir::Attribute::Parsed(AttributeKind::Feature(feature_idents, _))) =
-        AttributeParser::parse_limited(
-            sess,
-            krate_attrs,
-            sym::feature,
-            DUMMY_SP,
-            DUMMY_NODE_ID,
-            Some(&features),
-        )
+        AttributeParser::parse_limited(sess, krate_attrs, sym::feature, Some(&features))
     {
         for feature_ident in feature_idents {
             // If the enabled feature has been removed, issue an error.
diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs
@@ -313,8 +313,6 @@ impl EarlyLintPass for UnsafeCode {
                         cx.builder.sess(),
                         &it.attrs,
                         sym::allow_internal_unsafe,
-                        it.span,
-                        DUMMY_NODE_ID,
                         Some(cx.builder.features()),
                     )
                 {
diff --git a/compiler/rustc_lint/src/nonstandard_style.rs b/compiler/rustc_lint/src/nonstandard_style.rs
@@ -145,7 +145,7 @@ impl NonCamelCaseTypes {
 impl EarlyLintPass for NonCamelCaseTypes {
     fn check_item(&mut self, cx: &EarlyContext<'_>, it: &ast::Item) {
         let has_repr_c = matches!(
-            AttributeParser::parse_limited(cx.sess(), &it.attrs, sym::repr, it.span, it.id, None),
+            AttributeParser::parse_limited(cx.sess(), &it.attrs, sym::repr, None),
             Some(Attribute::Parsed(AttributeKind::Repr { reprs, ..})) if reprs.iter().any(|(r, _)| r == &ReprAttr::ReprC)
         );
 
diff --git a/compiler/rustc_passes/src/debugger_visualizer.rs b/compiler/rustc_passes/src/debugger_visualizer.rs
@@ -1,7 +1,6 @@
 //! Detecting usage of the `#[debugger_visualizer]` attribute.
 
-use rustc_ast::ast::NodeId;
-use rustc_ast::{HasNodeId, ItemKind, ast};
+use rustc_ast::{ItemKind, ast};
 use rustc_attr_parsing::AttributeParser;
 use rustc_expand::base::resolve_path;
 use rustc_hir::Attribute;
@@ -10,26 +9,14 @@ use rustc_middle::middle::debugger_visualizer::DebuggerVisualizerFile;
 use rustc_middle::query::{LocalCrate, Providers};
 use rustc_middle::ty::TyCtxt;
 use rustc_session::Session;
-use rustc_span::{DUMMY_SP, Span, sym};
+use rustc_span::sym;
 
 use crate::errors::DebugVisualizerUnreadable;
 
 impl DebuggerVisualizerCollector<'_> {
-    fn check_for_debugger_visualizer(
-        &mut self,
-        attrs: &[ast::Attribute],
-        span: Span,
-        node_id: NodeId,
-    ) {
+    fn check_for_debugger_visualizer(&mut self, attrs: &[ast::Attribute]) {
         if let Some(Attribute::Parsed(AttributeKind::DebuggerVisualizer(visualizers))) =
-            AttributeParser::parse_limited(
-                &self.sess,
-                attrs,
-                sym::debugger_visualizer,
-                span,
-                node_id,
-                None,
-            )
+            AttributeParser::parse_limited(&self.sess, attrs, sym::debugger_visualizer, None)
         {
             for DebugVisualizer { span, visualizer_type, path } in visualizers {
                 let file = match resolve_path(&self.sess, path.as_str(), span) {
@@ -69,12 +56,12 @@ struct DebuggerVisualizerCollector<'a> {
 impl<'ast> rustc_ast::visit::Visitor<'ast> for DebuggerVisualizerCollector<'_> {
     fn visit_item(&mut self, item: &'ast rustc_ast::Item) -> Self::Result {
         if let ItemKind::Mod(..) = item.kind {
-            self.check_for_debugger_visualizer(&item.attrs, item.span, item.node_id());
+            self.check_for_debugger_visualizer(&item.attrs);
         }
         rustc_ast::visit::walk_item(self, item);
     }
     fn visit_crate(&mut self, krate: &'ast ast::Crate) -> Self::Result {
-        self.check_for_debugger_visualizer(&krate.attrs, DUMMY_SP, krate.id);
+        self.check_for_debugger_visualizer(&krate.attrs);
         rustc_ast::visit::walk_crate(self, krate);
     }
 }
diff --git a/compiler/rustc_resolve/src/build_reduced_graph.rs b/compiler/rustc_resolve/src/build_reduced_graph.rs
@@ -1116,14 +1116,7 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
         let mut import_all = None;
         let mut single_imports = ThinVec::new();
         if let Some(Attribute::Parsed(AttributeKind::MacroUse { span, arguments })) =
-            AttributeParser::parse_limited(
-                self.r.tcx.sess,
-                &item.attrs,
-                sym::macro_use,
-                item.span,
-                item.id,
-                None,
-            )
+            AttributeParser::parse_limited(self.r.tcx.sess, &item.attrs, sym::macro_use, None)
         {
             if self.parent_scope.module.parent.is_some() {
                 self.r
diff --git a/compiler/rustc_resolve/src/macros.rs b/compiler/rustc_resolve/src/macros.rs
@@ -4,7 +4,7 @@
 use std::mem;
 use std::sync::Arc;
 
-use rustc_ast::{self as ast, Crate, DUMMY_NODE_ID, NodeId};
+use rustc_ast::{self as ast, Crate, NodeId};
 use rustc_ast_pretty::pprust;
 use rustc_attr_parsing::AttributeParser;
 use rustc_errors::{Applicability, DiagCtxtHandle, StashKey};
@@ -141,8 +141,6 @@ pub fn registered_tools_ast(
             sess,
             pre_configured_attrs,
             sym::register_tool,
-            DUMMY_SP,
-            DUMMY_NODE_ID,
             Some(features),
         )
     {
diff --git a/tests/ui/attributes/attr-order-deprecated.rs b/tests/ui/attributes/attr-order-deprecated.rs
@@ -0,0 +1,11 @@
+#[deprecated = "AAA"]
+//~^ NOTE also specified here
+#[deprecated = "BBB"]
+//~^ ERROR multiple `deprecated` attributes
+fn deprecated() { }
+
+fn main() {
+    deprecated();
+    //~^ WARN use of deprecated function `deprecated`: AAA [deprecated]
+    //~| NOTE `#[warn(deprecated)]` on by default
+}
diff --git a/tests/ui/attributes/attr-order-deprecated.stderr b/tests/ui/attributes/attr-order-deprecated.stderr
@@ -0,0 +1,22 @@
+error: multiple `deprecated` attributes
+  --> $DIR/attr-order-deprecated.rs:3:1
+   |
+LL | #[deprecated = "BBB"]
+   | ^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
+   |
+note: attribute also specified here
+  --> $DIR/attr-order-deprecated.rs:1:1
+   |
+LL | #[deprecated = "AAA"]
+   | ^^^^^^^^^^^^^^^^^^^^^
+
+warning: use of deprecated function `deprecated`: AAA
+  --> $DIR/attr-order-deprecated.rs:8:5
+   |
+LL |     deprecated();
+   |     ^^^^^^^^^^
+   |
+   = note: `#[warn(deprecated)]` on by default
+
+error: aborting due to 1 previous error; 1 warning emitted
+
diff --git a/tests/ui/attributes/attr-order-must-use.rs b/tests/ui/attributes/attr-order-must-use.rs
@@ -0,0 +1,19 @@
+#![deny(unused)]
+//~^ NOTE lint level is defined here
+
+#[must_use = "AAA"]
+//~^ NOTE also specified here
+#[must_use = "BBB"]
+//~^ ERROR unused attribute
+//~| WARN previously accepted
+//~| NOTE `#[deny(unused_attributes)]` implied by `#[deny(unused)]`
+fn must_use() -> usize {
+    0
+}
+
+fn main() {
+    must_use();
+    //~^ ERROR unused return value of `must_use` that must be used
+    //~| NOTE AAA
+    //~| NOTE `#[deny(unused_must_use)]` implied by `#[deny(unused)]`
+}
diff --git a/tests/ui/attributes/attr-order-must-use.stderr b/tests/ui/attributes/attr-order-must-use.stderr
@@ -0,0 +1,34 @@
+error: unused attribute
+  --> $DIR/attr-order-must-use.rs:6:1
+   |
+LL | #[must_use = "BBB"]
+   | ^^^^^^^^^^^^^^^^^^^ help: remove this attribute
+   |
+note: attribute also specified here
+  --> $DIR/attr-order-must-use.rs:4:1
+   |
+LL | #[must_use = "AAA"]
+   | ^^^^^^^^^^^^^^^^^^^
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+note: the lint level is defined here
+  --> $DIR/attr-order-must-use.rs:1:9
+   |
+LL | #![deny(unused)]
+   |         ^^^^^^
+   = note: `#[deny(unused_attributes)]` implied by `#[deny(unused)]`
+
+error: unused return value of `must_use` that must be used
+  --> $DIR/attr-order-must-use.rs:15:5
+   |
+LL |     must_use();
+   |     ^^^^^^^^^^
+   |
+   = note: AAA
+   = note: `#[deny(unused_must_use)]` implied by `#[deny(unused)]`
+help: use `let _ = ...` to ignore the resulting value
+   |
+LL |     let _ = must_use();
+   |     +++++++
+
+error: aborting due to 2 previous errors
+

Original file line number	Diff line number	Diff line change
`@@ -313,8 +313,6 @@ impl EarlyLintPass for UnsafeCode {`
`313`	`313`	`cx.builder.sess(),`
`314`	`314`	`&it.attrs,`
`315`	`315`	`sym::allow_internal_unsafe,`
`316`		`- it.span,`
`317`		`- DUMMY_NODE_ID,`
`318`	`316`	`Some(cx.builder.features()),`
`319`	`317`	`)`
`320`	`318`	`{`