remove attr id from rustc_attr_parsing::AcceptContext

Author: Bryntet

compiler/rustc_attr_parsing/src/attributes/lint.rs

@@ -1,5 +1,4 @@
 use rustc_ast::LitKind;
-use rustc_hir::HashIgnoredAttrId;
 use rustc_hir::attrs::{LintAttribute, LintAttributeKind, LintInstance};
 use rustc_hir::lints::AttributeLintKind;
 use rustc_hir::target::GenericParamKind;
@@ -251,7 +250,6 @@ fn validate_lint_attr<T: Lint, S: Stage>(
         lint_instances,
         attr_span: cx.attr_span,
         attr_style: cx.attr_style,
-        attr_id: HashIgnoredAttrId { attr_id: cx.attr_id },
         target_span: cx.target_span,
         kind: T::KIND,
     })

compiler/rustc_attr_parsing/src/context.rs

@@ -15,7 +15,7 @@ use rustc_hir::{AttrPath, HirId};
 use rustc_parse::parser::Recovery;
 use rustc_session::Session;
 use rustc_session::lint::{Lint, LintId};
-use rustc_span::{AttrId, ErrorGuaranteed, Span, Symbol};
+use rustc_span::{ErrorGuaranteed, Span, Symbol};
 
 use crate::AttributeParser;
 // Glob imports to avoid big, bitrotty import lists
@@ -447,8 +447,6 @@ pub struct AcceptContext<'f, 'sess, S: Stage> {
 
     /// The name of the attribute we're currently accepting.
     pub(crate) attr_path: AttrPath,
-
-    pub(crate) attr_id: AttrId,
 }
 
 impl<'f, 'sess: 'f, S: Stage> SharedContext<'f, 'sess, S> {

compiler/rustc_attr_parsing/src/interface.rs

@@ -240,7 +240,6 @@ impl<'sess> AttributeParser<'sess, Early> {
         if let Some(safety) = attr_safety {
             parser.check_attribute_safety(&attr_path, inner_span, safety, &mut emit_lint)
         }
-        let attr_id = sess.psess.attr_id_generator.mk_attr_id();
         let mut cx: AcceptContext<'_, 'sess, Early> = AcceptContext {
             shared: SharedContext {
                 cx: &mut parser,
@@ -254,7 +253,6 @@ impl<'sess> AttributeParser<'sess, Early> {
             parsed_description,
             template,
             attr_path,
-            attr_id,
         };
         parse_fn(&mut cx, args)
     }
@@ -420,7 +418,6 @@ impl<'sess, S: Stage> AttributeParser<'sess, S> {
                             parsed_description: ParsedDescription::Attribute,
                             template: &accept.template,
                             attr_path: attr_path.clone(),
-                            attr_id: attr.id,
                         };
 
                         (accept.accept_fn)(&mut cx, &args);

compiler/rustc_hir/src/attrs/data_structures.rs

@@ -22,9 +22,7 @@ use thin_vec::ThinVec;
 use crate::attrs::diagnostic::*;
 use crate::attrs::pretty_printing::PrintAttribute;
 use crate::limit::Limit;
-use crate::{
-    DefaultBodyStability, HashIgnoredAttrId, PartialConstStability, RustcVersion, Stability,
-};
+use crate::{DefaultBodyStability, PartialConstStability, RustcVersion, Stability};
 
 #[derive(Copy, Clone, Debug, HashStable_Generic, Encodable, Decodable, PrintAttribute)]
 pub enum EiiImplResolution {
@@ -904,8 +902,6 @@ pub struct LintAttribute {
     pub attr_style: AttrStyle,
     pub attr_span: Span,
     pub target_span: Span,
-    /// Needed by `LintExpectationId` to track fulfilled expectations
-    pub attr_id: HashIgnoredAttrId,
     pub lint_instances: ThinVec<LintInstance>,
 }
 

compiler/rustc_lint_defs/src/lib.rs

@@ -9,10 +9,9 @@ use rustc_data_structures::stable_hasher::{
 use rustc_error_messages::{DiagArgValue, IntoDiagArg};
 use rustc_hir_id::{HirId, ItemLocalId};
 use rustc_macros::{Decodable, Encodable, HashStable_Generic};
-use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
 use rustc_span::def_id::DefPathHash;
 pub use rustc_span::edition::Edition;
-use rustc_span::{HashStableContext, Ident, Span, SpanDecoder, SpanEncoder, Symbol, sym};
+use rustc_span::{HashStableContext, Ident, Span, Symbol, sym};
 use serde::{Deserialize, Serialize};
 
 pub use self::Level::*;