use rustc_attr_ir imports more

Cargo.lock

@@ -3679,11 +3679,11 @@ dependencies = [
  "rustc_abi",
  "rustc_ast",
  "rustc_ast_pretty",
+ "rustc_attr_ir",
  "rustc_attr_parsing",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
- "rustc_hir",
  "rustc_macros",
  "rustc_session",
  "rustc_span",
@@ -3725,10 +3725,10 @@ dependencies = [
  "rustc_abi",
  "rustc_ast",
  "rustc_ast_pretty",
+ "rustc_attr_ir",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
- "rustc_hir",
  "rustc_lexer",
  "rustc_lint_defs",
  "rustc_macros",
@@ -3781,12 +3781,12 @@ version = "0.0.0"
 dependencies = [
  "rustc_ast",
  "rustc_ast_pretty",
+ "rustc_attr_ir",
  "rustc_attr_parsing",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
  "rustc_feature",
- "rustc_hir",
  "rustc_index",
  "rustc_lexer",
  "rustc_lint_defs",
@@ -4037,6 +4037,7 @@ dependencies = [
  "rustc_ast",
  "rustc_ast_passes",
  "rustc_ast_pretty",
+ "rustc_attr_ir",
  "rustc_attr_parsing",
  "rustc_data_structures",
  "rustc_errors",
@@ -4746,6 +4747,7 @@ dependencies = [
  "libc",
  "rustc_abi",
  "rustc_ast",
+ "rustc_attr_ir",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",

compiler/rustc_ast_passes/Cargo.toml

@@ -9,11 +9,11 @@ itertools = "0.15"
 rustc_abi = { path = "../rustc_abi" }
 rustc_ast = { path = "../rustc_ast" }
 rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_attr_ir = { path = "../rustc_attr_ir" }
 rustc_attr_parsing = { path = "../rustc_attr_parsing" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
 rustc_feature = { path = "../rustc_feature" }
-rustc_hir = { path = "../rustc_hir" }
 rustc_macros = { path = "../rustc_macros" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }

compiler/rustc_ast_passes/src/feature_gate.rs

@@ -1,10 +1,9 @@
 use rustc_ast::visit::{self, AssocCtxt, FnKind, Visitor};
 use rustc_ast::{self as ast, AttrVec, GenericBound, NodeId, PatKind, attr, token};
+use rustc_attr_ir::{Attribute, AttributeKind};
 use rustc_attr_parsing::AttributeParser;
 use rustc_errors::msg;
 use rustc_feature::Features;
-use rustc_hir::Attribute;
-use rustc_hir::attrs::AttributeKind;
 use rustc_session::Session;
 use rustc_session::diagnostics::{feature_err, feature_warn};
 use rustc_span::{Span, Spanned, Symbol, sym};

compiler/rustc_attr_parsing/Cargo.toml

@@ -8,10 +8,10 @@ edition = "2024"
 rustc_abi = { path = "../rustc_abi" }
 rustc_ast = { path = "../rustc_ast" }
 rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_attr_ir = { path = "../rustc_attr_ir" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
 rustc_feature = { path = "../rustc_feature" }
-rustc_hir = { path = "../rustc_hir" }
 rustc_lexer = { path = "../rustc_lexer" }
 rustc_lint_defs = { path = "../rustc_lint_defs" }
 rustc_macros = { path = "../rustc_macros" }

compiler/rustc_attr_parsing/src/attributes/autodiff.rs

@@ -2,9 +2,9 @@ use std::str::FromStr;
 
 use rustc_ast::LitKind;
 use rustc_ast::expand::autodiff_attrs::{DiffActivity, DiffMode};
+use rustc_attr_ir::target::{MethodKind, Target};
+use rustc_attr_ir::{AttributeKind, RustcAutodiff};
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::{AttributeKind, RustcAutodiff};
-use rustc_hir::{MethodKind, Target};
 use rustc_span::{Symbol, sym};
 use thin_vec::ThinVec;
 

compiler/rustc_attr_parsing/src/attributes/cfg.rs

@@ -3,10 +3,10 @@ use std::convert::identity;
 use rustc_ast::token::Delimiter;
 use rustc_ast::tokenstream::{DelimSpan, WithTokens};
 use rustc_ast::{AttrItem, Attribute, LitKind, ast, token};
+use rustc_attr_ir::target::Target;
+use rustc_attr_ir::{AttrPath, CfgEntry, RustcVersion};
 use rustc_errors::{Applicability, Diagnostic, PResult, msg};
 use rustc_feature::{Features, GatedCfg, find_gated_cfg};
-use rustc_hir::attrs::{CfgEntry, RustcVersion};
-use rustc_hir::{AttrPath, Target};
 use rustc_parse::parser::{ForceCollect, Parser, Recovery};
 use rustc_parse::{exp, parse_in};
 use rustc_session::Session;

compiler/rustc_attr_parsing/src/attributes/cfg_select.rs

@@ -1,11 +1,11 @@
 use rustc_ast::token::Token;
 use rustc_ast::tokenstream::TokenStream;
 use rustc_ast::{AttrStyle, NodeId, token};
+use rustc_attr_ir::target::Target;
+use rustc_attr_ir::{AttrPath, CfgEntry};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::{Diagnostic, MultiSpan};
 use rustc_feature::Features;
-use rustc_hir::attrs::CfgEntry;
-use rustc_hir::{AttrPath, Target};
 use rustc_parse::exp;
 use rustc_parse::parser::{Parser, Recovery};
 use rustc_session::Session;

compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs

@@ -1,8 +1,7 @@
-use rustc_feature::AttributeStability;
-use rustc_hir::attrs::{
-    CoverageAttrKind, InstrumentFnAttr, OptimizeAttr, RtsanSetting, SanitizerSet, UsedBy,
+use rustc_attr_ir::{
+    CoverageAttrKind, InstrumentFnAttr, OptimizeAttr, RtsanSetting, SanitizerSet, UsedBy, find_attr,
 };
-use rustc_hir::find_attr;
+use rustc_feature::AttributeStability;
 use rustc_session::diagnostics::feature_err;
 use rustc_span::edition::Edition::Edition2024;
 

compiler/rustc_attr_parsing/src/attributes/crate_level.rs

@@ -1,6 +1,6 @@
+use rustc_attr_ir::{CrateType, WindowsSubsystemKind};
 use rustc_data_structures::fx::FxIndexSet;
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::{CrateType, WindowsSubsystemKind};
 use rustc_session::lint::builtin::{DUPLICATE_TOOLS, UNKNOWN_CRATE_TYPES};
 use rustc_span::Symbol;
 use rustc_span::edit_distance::find_best_match_for_name_with_substrings;

compiler/rustc_attr_parsing/src/attributes/debugger.rs

@@ -1,5 +1,5 @@
+use rustc_attr_ir::{DebugVisualizer, DebuggerVisualizerType};
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::{DebugVisualizer, DebuggerVisualizerType};
 
 use super::prelude::*;
 

compiler/rustc_attr_parsing/src/attributes/deprecation.rs

@@ -1,7 +1,6 @@
 use rustc_ast::LitKind;
+use rustc_attr_ir::{DeprecatedSince, Deprecation, RustcVersion, VERSION_PLACEHOLDER};
 use rustc_feature::AttributeStability;
-use rustc_hir::VERSION_PLACEHOLDER;
-use rustc_hir::attrs::{DeprecatedSince, Deprecation, RustcVersion};
 
 use super::prelude::*;
 use super::util::parse_version;

compiler/rustc_attr_parsing/src/attributes/diagnostic/do_not_recommend.rs

@@ -1,6 +1,6 @@
+use rustc_attr_ir::AttributeKind;
+use rustc_attr_ir::target::Target;
 use rustc_feature::AttributeStability;
-use rustc_hir::Target;
-use rustc_hir::attrs::AttributeKind;
 use rustc_session::lint::builtin::MALFORMED_DIAGNOSTIC_ATTRIBUTES;
 use rustc_span::{Symbol, sym};
 

compiler/rustc_attr_parsing/src/attributes/diagnostic/mod.rs

@@ -1,11 +1,11 @@
 use std::ops::Range;
 
 use rustc_ast::PathSegment;
-use rustc_errors::{Diagnostic, MultiSpan};
-use rustc_hir::attrs::diagnostic::{
+use rustc_attr_ir::diagnostic::{
     Directive, Filter, FilterFormatString, Flag, FormatArg, FormatString, LitOrArg, Name,
     NameValue, Piece, Predicate,
 };
+use rustc_errors::{Diagnostic, MultiSpan};
 use rustc_lint_defs::LintId;
 use rustc_parse_format::{
     Argument, FormatSpec, ParseError, ParseMode, Parser, Piece as RpfPiece, Position,

compiler/rustc_attr_parsing/src/attributes/diagnostic/on_const.rs

@@ -1,5 +1,5 @@
+use rustc_attr_ir::diagnostic::Directive;
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::diagnostic::Directive;
 
 use crate::attributes::diagnostic::*;
 use crate::attributes::prelude::*;

compiler/rustc_attr_parsing/src/attributes/diagnostic/on_move.rs

@@ -1,5 +1,5 @@
+use rustc_attr_ir::AttributeKind;
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::AttributeKind;
 use rustc_span::sym;
 
 use crate::attributes::diagnostic::*;

compiler/rustc_attr_parsing/src/attributes/diagnostic/on_type_error.rs

@@ -1,4 +1,4 @@
-use rustc_hir::attrs::AttributeKind;
+use rustc_attr_ir::AttributeKind;
 use rustc_span::sym;
 
 use crate::attributes::AttributeStability;

compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unimplemented.rs

@@ -1,5 +1,5 @@
+use rustc_attr_ir::diagnostic::Directive;
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::diagnostic::Directive;
 
 use crate::attributes::diagnostic::*;
 use crate::attributes::prelude::*;

compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unknown.rs

@@ -1,5 +1,5 @@
+use rustc_attr_ir::diagnostic::Directive;
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::diagnostic::Directive;
 
 use crate::attributes::diagnostic::*;
 use crate::attributes::prelude::*;

compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unmatched_args.rs

@@ -1,5 +1,5 @@
+use rustc_attr_ir::diagnostic::Directive;
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::diagnostic::Directive;
 
 use crate::attributes::diagnostic::*;
 use crate::attributes::prelude::*;

compiler/rustc_attr_parsing/src/attributes/diagnostic/opaque.rs

@@ -1,6 +1,6 @@
+use rustc_attr_ir::AttributeKind;
+use rustc_attr_ir::target::Target;
 use rustc_feature::AttributeStability;
-use rustc_hir::Target;
-use rustc_hir::attrs::AttributeKind;
 use rustc_session::lint::builtin::MALFORMED_DIAGNOSTIC_ATTRIBUTES;
 use rustc_span::{Span, sym};
 

compiler/rustc_attr_parsing/src/attributes/doc.rs

@@ -1,12 +1,12 @@
 use rustc_ast::ast::{AttrStyle, LitKind, MetaItemLit};
-use rustc_data_structures::fx::{FxHashSet, FxIndexMap, IndexEntry};
-use rustc_errors::{Applicability, msg};
-use rustc_feature::AttributeStability;
-use rustc_hir::Target;
-use rustc_hir::attrs::{
+use rustc_attr_ir::target::Target;
+use rustc_attr_ir::{
     AttributeKind, CfgEntry, CfgHideShow, DocAttribute, DocCfgHideShow, DocCfgHideShowValue,
     DocInline, HideOrShow,
 };
+use rustc_data_structures::fx::{FxHashSet, FxIndexMap, IndexEntry};
+use rustc_errors::{Applicability, msg};
+use rustc_feature::AttributeStability;
 use rustc_session::diagnostics::feature_err;
 use rustc_span::{Span, Symbol, edition, sym};
 

compiler/rustc_attr_parsing/src/attributes/dummy.rs

@@ -1,5 +1,5 @@
+use rustc_attr_ir::AttributeKind;
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::AttributeKind;
 use rustc_span::{Symbol, sym};
 
 use crate::attributes::{OnDuplicate, SingleAttributeParser};

compiler/rustc_attr_parsing/src/attributes/inline.rs

@@ -1,6 +1,5 @@
+use rustc_attr_ir::{AttributeKind, InlineAttr, find_attr};
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::{AttributeKind, InlineAttr};
-use rustc_hir::find_attr;
 use rustc_session::lint::builtin::ILL_FORMED_ATTRIBUTE_INPUT;
 
 use super::prelude::*;

compiler/rustc_attr_parsing/src/attributes/instruction_set.rs

@@ -1,5 +1,5 @@
+use rustc_attr_ir::InstructionSetAttr;
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::InstructionSetAttr;
 
 use super::prelude::*;
 use crate::diagnostics;

compiler/rustc_attr_parsing/src/attributes/link_attrs.rs

@@ -1,7 +1,7 @@
+use rustc_attr_ir::AttributeKind::{LinkName, LinkOrdinal, LinkSection};
+use rustc_attr_ir::*;
 use rustc_errors::msg;
 use rustc_feature::{AttributeStability, Features};
-use rustc_hir::attrs::AttributeKind::{LinkName, LinkOrdinal, LinkSection};
-use rustc_hir::attrs::*;
 use rustc_session::Session;
 use rustc_session::diagnostics::feature_err;
 use rustc_session::lint::builtin::ILL_FORMED_ATTRIBUTE_INPUT;

compiler/rustc_attr_parsing/src/attributes/lint_helpers.rs

@@ -1,6 +1,5 @@
+use rustc_attr_ir::{ReprAttr, find_attr};
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::ReprAttr;
-use rustc_hir::find_attr;
 
 use super::prelude::*;
 use crate::diagnostics::RustcPubTransparent;

compiler/rustc_attr_parsing/src/attributes/macro_attrs.rs

@@ -1,6 +1,5 @@
+use rustc_attr_ir::{CollapseMacroDebuginfo, MacroUseArgs, find_attr};
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::{CollapseMacroDebuginfo, MacroUseArgs};
-use rustc_hir::find_attr;
 use rustc_session::lint::builtin::INVALID_MACRO_EXPORT_ARGUMENTS;
 
 use super::prelude::*;

compiler/rustc_attr_parsing/src/attributes/mod.rs

@@ -20,8 +20,8 @@
 
 use std::marker::PhantomData;
 
+use rustc_attr_ir::AttributeKind;
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::AttributeKind;
 use rustc_span::edition::Edition;
 use rustc_span::{Span, Symbol};
 use thin_vec::ThinVec;

compiler/rustc_attr_parsing/src/attributes/non_exhaustive.rs

@@ -1,6 +1,6 @@
+use rustc_attr_ir::AttributeKind;
+use rustc_attr_ir::target::Target;
 use rustc_feature::AttributeStability;
-use rustc_hir::Target;
-use rustc_hir::attrs::AttributeKind;
 use rustc_span::{Span, Symbol, sym};
 
 use crate::attributes::{NoArgsAttributeParser, OnDuplicate};

compiler/rustc_attr_parsing/src/attributes/pin_v2.rs

@@ -1,6 +1,6 @@
+use rustc_attr_ir::AttributeKind;
+use rustc_attr_ir::target::Target;
 use rustc_feature::AttributeStability;
-use rustc_hir::Target;
-use rustc_hir::attrs::AttributeKind;
 use rustc_span::{Span, Symbol, sym};
 
 use crate::attributes::NoArgsAttributeParser;

compiler/rustc_attr_parsing/src/attributes/prelude.rs

@@ -1,8 +1,8 @@
 // data structures
 #[doc(hidden)]
-pub(super) use rustc_hir::attrs::AttributeKind;
+pub(super) use rustc_attr_ir::AttributeKind;
 #[doc(hidden)]
-pub(super) use rustc_hir::{MethodKind, Target};
+pub(super) use rustc_attr_ir::target::{MethodKind, Target};
 #[doc(hidden)]
 pub(super) use rustc_span::{Ident, Span, Symbol, sym};
 #[doc(hidden)]

compiler/rustc_attr_parsing/src/attributes/prototype.rs

@@ -1,8 +1,8 @@
 //! Attributes that are only used on function prototypes.
 
+use rustc_attr_ir::target::Target;
+use rustc_attr_ir::{AttributeKind, MirDialect, MirPhase};
 use rustc_feature::AttributeStability;
-use rustc_hir::Target;
-use rustc_hir::attrs::{AttributeKind, MirDialect, MirPhase};
 use rustc_span::{Span, Symbol, sym};
 
 use crate::attributes::SingleAttributeParser;

compiler/rustc_attr_parsing/src/attributes/repr.rs

@@ -1,8 +1,8 @@
 use rustc_abi::{Align, Size};
 use rustc_ast::{IntTy, LitIntType, LitKind, UintTy};
+use rustc_attr_ir::IntType::{SignedInt, UnsignedInt};
+use rustc_attr_ir::ReprAttr;
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::IntType::{SignedInt, UnsignedInt};
-use rustc_hir::attrs::ReprAttr;
 use rustc_session::diagnostics::feature_err;
 
 use super::prelude::*;
@@ -161,7 +161,7 @@ fn parse_repr(cx: &mut AcceptContext<'_, '_>, param: &MetaItemParser) -> Option<
                 &AllowedTargets::AllowList(&[
                     Allow(Target::Struct),
                     Allow(Target::Enum),
-                    Allow(Target::Union), // Feature gated in `rustc_hir_analysis`
+                    Allow(Target::Union), // Feature gated in `rustc_attr_ir_analysis`
                     Warn(Target::MacroCall),
                 ]),
             );

compiler/rustc_attr_parsing/src/attributes/rustc_dump.rs

@@ -1,6 +1,6 @@
+use rustc_attr_ir::target::{MethodKind, Target};
+use rustc_attr_ir::{AttributeKind, RustcDumpLayoutKind};
 use rustc_feature::AttributeStability;
-use rustc_hir::attrs::{AttributeKind, RustcDumpLayoutKind};
-use rustc_hir::{MethodKind, Target};
 use rustc_span::{Span, Symbol, sym};
 
 use super::prelude::*;