fix deprecated rustc_hir::attrs imports

book/src/development/common_tools_writing_lints.md

@@ -87,7 +87,7 @@ arguments have to be checked separately.
 ```rust
 use clippy_utils::{paths, sym};
 use clippy_utils::res::MaybeDef;
-use rustc_hir::LangItem;
+use rustc_attr_ir::lang_items::LangItem;
 
 impl LateLintPass<'_> for MyStructLint {
     fn check_expr(&mut self, cx: &LateContext<'_>, expr: &Expr<'_>) {

clippy_config/src/conf.rs

@@ -5,10 +5,10 @@ use crate::types::{
     PubUnderscoreFieldsBehaviour, Rename, SourceItemOrdering, SourceItemOrderingModuleItemGroupings,
     SourceItemOrderingTraitAssocItemKinds, SourceItemOrderingWithinModuleItemGroupings, TraitImplItemOrder,
 };
+use rustc_attr_ir::RustcVersion;
 use rustc_attr_parsing::parse_version;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::RustcVersion;
 use rustc_session::Session;
 use rustc_span::{Pos as _, SourceFile, Symbol};
 use std::path::PathBuf;

clippy_config/src/de.rs

@@ -1,9 +1,9 @@
 use arrayvec::ArrayVec;
 use core::str::FromStr as _;
 use itertools::Itertools as _;
+use rustc_attr_ir::RustcVersion;
 use rustc_attr_parsing::parse_version;
 use rustc_errors::{DiagCtxtHandle, DiagMessage};
-use rustc_hir::attrs::RustcVersion;
 use rustc_session::Session;
 use rustc_session::config::ErrorOutputType;
 use rustc_span::edit_distance::edit_distance;

clippy_config/src/lib.rs

@@ -8,6 +8,7 @@
 )]
 #![expect(clippy::must_use_candidate)]
 
+extern crate rustc_attr_ir;
 extern crate rustc_attr_parsing;
 extern crate rustc_data_structures;
 extern crate rustc_errors;

clippy_lints/src/approx_const.rs

@@ -2,7 +2,7 @@ use clippy_config::Conf;
 use clippy_utils::diagnostics::span_lint_and_help;
 use clippy_utils::msrvs::{self, Msrv};
 use rustc_ast::ast::{FloatTy, LitFloatType, LitKind};
-use rustc_hir::attrs::RustcVersion;
+use rustc_attr_ir::RustcVersion;
 use rustc_hir::{HirId, Lit};
 use rustc_lint::{LateContext, LateLintPass, impl_lint_pass};
 use rustc_span::{Span, symbol};

clippy_lints/src/arbitrary_source_item_ordering.rs

@@ -6,7 +6,7 @@ use clippy_config::types::{
 };
 use clippy_utils::diagnostics::span_lint_and_note;
 use clippy_utils::is_cfg_test;
-use rustc_hir::attrs::AttributeKind;
+use rustc_attr_ir::AttributeKind;
 use rustc_hir::{
     Attribute, FieldDef, HirId, ImplItemId, IsAuto, Item, ItemKind, Mod, OwnerId, QPath, TraitItemId, TyKind, Variant,
     VariantData,

clippy_lints/src/assert_is_empty.rs

@@ -5,8 +5,8 @@ use clippy_utils::source::walk_span_to_context;
 use clippy_utils::sugg::Sugg;
 use clippy_utils::sym;
 use clippy_utils::ty::implements_trait;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::{Expr, ExprKind, UnOp};
 use rustc_lint::{LateContext, LateLintPass, LintContext as _, declare_lint_pass};
 use rustc_middle::ty::{self, Ty};

clippy_lints/src/attrs/inline_always.rs

@@ -1,8 +1,8 @@
 use super::INLINE_ALWAYS;
 use super::utils::is_relevant_expr;
 use clippy_utils::diagnostics::span_lint;
-use rustc_hir::attrs::InlineAttr;
-use rustc_hir::{Attribute, BodyId, find_attr};
+use rustc_attr_ir::{Attribute, InlineAttr, find_attr};
+use rustc_hir::BodyId;
 use rustc_lint::LateContext;
 use rustc_span::Span;
 use rustc_span::symbol::Symbol;

clippy_lints/src/attrs/repr_attributes.rs

@@ -1,5 +1,4 @@
-use rustc_hir::attrs::ReprAttr;
-use rustc_hir::{Attribute, find_attr};
+use rustc_attr_ir::{Attribute, ReprAttr, find_attr};
 use rustc_lint::LateContext;
 use rustc_span::Span;
 

clippy_lints/src/booleans.rs

@@ -8,8 +8,8 @@ use clippy_utils::sugg::Sugg;
 use clippy_utils::ty::implements_trait;
 use clippy_utils::{eq_expr_value, sym};
 use rustc_ast::ast::LitKind;
+use rustc_attr_ir::RustcVersion;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::RustcVersion;
 use rustc_hir::intravisit::{FnKind, Visitor, walk_expr};
 use rustc_hir::{BinOpKind, Body, Expr, ExprKind, FnDecl, UnOp};
 use rustc_lint::{LateContext, LateLintPass, impl_lint_pass};

clippy_lints/src/box_default.rs

@@ -3,8 +3,8 @@ use clippy_utils::macros::macro_backtrace;
 use clippy_utils::res::{MaybeDef as _, MaybeResPath as _};
 use clippy_utils::ty::expr_sig;
 use clippy_utils::{is_default_equivalent, sym};
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::def::Res;
 use rustc_hir::intravisit::{InferKind, Visitor, VisitorExt as _, walk_ty};
 use rustc_hir::{AmbigArg, Block, Expr, ExprKind, HirId, LetStmt, Node, QPath, Ty, TyKind};

clippy_lints/src/cloned_ref_to_slice_refs.rs

@@ -8,8 +8,8 @@ use clippy_utils::sugg::Sugg;
 use clippy_utils::visitors::is_const_evaluatable;
 use clippy_utils::{is_in_const_context, is_mutable, sym};
 use rustc_ast::Mutability;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::{Expr, ExprKind, HirId};
 use rustc_lint::{LateContext, LateLintPass, impl_lint_pass};
 use rustc_middle::ty;

clippy_lints/src/cognitive_complexity.rs

@@ -5,8 +5,9 @@ use clippy_utils::source::{IntoSpan as _, SpanExt as _};
 use clippy_utils::visitors::for_each_expr_without_closures;
 use clippy_utils::{LimitStack, get_async_fn_body, sym};
 use core::ops::ControlFlow;
+use rustc_attr_ir::Attribute;
 use rustc_hir::intravisit::FnKind;
-use rustc_hir::{Attribute, Body, Expr, ExprKind, FnDecl};
+use rustc_hir::{Body, Expr, ExprKind, FnDecl};
 use rustc_lint::{LateContext, LateLintPass, LintContext as _, impl_lint_pass};
 use rustc_span::Span;
 use rustc_span::def_id::LocalDefId;

clippy_lints/src/collection_is_never_read.rs

@@ -3,7 +3,7 @@ use clippy_utils::res::{MaybeDef as _, MaybeResPath as _};
 use clippy_utils::visitors::{Visitable, for_each_expr};
 use clippy_utils::{get_enclosing_block, sym};
 use core::ops::ControlFlow;
-use rustc_hir::attrs::lang_items::LangItem;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_hir::{Body, ExprKind, HirId, LetStmt, Node, PatKind};
 use rustc_lint::{LateContext, LateLintPass, declare_lint_pass};
 

clippy_lints/src/default_union_representation.rs

@@ -1,6 +1,6 @@
 use clippy_utils::diagnostics::span_lint_and_then;
-use rustc_hir::attrs::ReprAttr;
-use rustc_hir::{HirId, Item, ItemKind, find_attr};
+use rustc_attr_ir::{ReprAttr, find_attr};
+use rustc_hir::{HirId, Item, ItemKind};
 use rustc_lint::{LateContext, LateLintPass, declare_lint_pass};
 use rustc_middle::ty::layout::LayoutOf as _;
 use rustc_middle::ty::{self, FieldDef};

clippy_lints/src/doc/doc_suspicious_footnotes.rs

@@ -1,8 +1,8 @@
 use clippy_utils::diagnostics::span_lint_and_then;
 use rustc_ast::attr::AttributeExt as _;
 use rustc_ast::token::{CommentKind, DocFragmentKind};
+use rustc_attr_ir::AttributeKind;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::AttributeKind;
 use rustc_hir::{AttrStyle, Attribute};
 use rustc_lint::{LateContext, LintContext as _};
 

clippy_lints/src/doc/mod.rs

@@ -2,9 +2,10 @@ use clippy_config::Conf;
 use clippy_utils::attrs::is_doc_hidden;
 use clippy_utils::diagnostics::{span_lint, span_lint_and_help, span_lint_and_then};
 use clippy_utils::{is_entrypoint_fn, is_trait_impl_item};
+use rustc_attr_ir::Attribute;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::Applicability;
-use rustc_hir::{Attribute, FieldDef, ImplItemKind, ItemKind, Node, Safety, TraitItemKind};
+use rustc_hir::{FieldDef, ImplItemKind, ItemKind, Node, Safety, TraitItemKind};
 use rustc_lint::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext as _, impl_lint_pass};
 use rustc_resolve::rustdoc::pulldown_cmark::Event::{
     Code, DisplayMath, End, FootnoteReference, HardBreak, Html, InlineHtml, InlineMath, Rule, SoftBreak, Start,

clippy_lints/src/doc/suspicious_doc_comments.rs

@@ -1,9 +1,8 @@
 use clippy_utils::diagnostics::span_lint_and_then;
 use rustc_ast::AttrStyle;
 use rustc_ast::token::{CommentKind, DocFragmentKind};
+use rustc_attr_ir::{Attribute, AttributeKind};
 use rustc_errors::Applicability;
-use rustc_hir::Attribute;
-use rustc_hir::attrs::AttributeKind;
 use rustc_lint::LateContext;
 use rustc_span::Span;
 

clippy_lints/src/doc/too_long_first_doc_paragraph.rs

@@ -1,6 +1,6 @@
+use rustc_attr_ir::{Attribute, AttributeKind};
 use rustc_errors::Applicability;
-use rustc_hir::attrs::AttributeKind;
-use rustc_hir::{Attribute, Item, ItemKind};
+use rustc_hir::{Item, ItemKind};
 use rustc_lint::LateContext;
 
 use clippy_utils::diagnostics::span_lint_and_then;

clippy_lints/src/drop_forget_ref.rs

@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::is_must_use_func_call;
 use clippy_utils::res::MaybeDef as _;
 use clippy_utils::ty::{is_copy, opt_must_use_path};
-use rustc_hir::attrs::lang_items::LangItem;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_hir::{Arm, Expr, ExprKind, Node};
 use rustc_lint::{LateContext, LateLintPass, declare_lint_pass};
 use rustc_span::sym;

clippy_lints/src/duration_suboptimal_units.rs

@@ -6,8 +6,8 @@ use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::msrvs::{self, Msrv};
 use clippy_utils::res::MaybeDef as _;
 use clippy_utils::sym;
+use rustc_attr_ir::RustcVersion;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::RustcVersion;
 use rustc_hir::{Expr, ExprKind, QPath};
 use rustc_lint::{LateContext, LateLintPass, LintContext as _, impl_lint_pass};
 use rustc_middle::ty::{self, TyCtxt, UintTy};

clippy_lints/src/eta_reduction.rs

@@ -4,8 +4,9 @@ use clippy_utils::res::{MaybeDef as _, MaybeResPath as _};
 use clippy_utils::source::{snippet_opt, snippet_with_applicability};
 use clippy_utils::usage::{local_used_after_expr, local_used_in};
 use clippy_utils::{get_path_from_caller_to_method_type, is_adjusted, is_no_std_crate};
+use rustc_attr_ir::find_attr;
 use rustc_errors::Applicability;
-use rustc_hir::{BindingMode, Expr, ExprKind, FnRetTy, GenericArgs, Param, PatKind, QPath, Safety, TyKind, find_attr};
+use rustc_hir::{BindingMode, Expr, ExprKind, FnRetTy, GenericArgs, Param, PatKind, QPath, Safety, TyKind};
 use rustc_infer::infer::TyCtxtInferExt as _;
 use rustc_lint::{LateContext, LateLintPass, declare_lint_pass};
 use rustc_middle::ty::adjustment::{Adjust, DerefAdjustKind};

clippy_lints/src/exhaustive_items.rs

@@ -1,7 +1,8 @@
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::source::indent_of;
+use rustc_attr_ir::find_attr;
 use rustc_errors::Applicability;
-use rustc_hir::{Item, ItemKind, find_attr};
+use rustc_hir::{Item, ItemKind};
 use rustc_lint::{LateContext, LateLintPass, declare_lint_pass};
 
 declare_clippy_lint! {

clippy_lints/src/format_args.rs

@@ -19,12 +19,12 @@ use rustc_ast::{
     BorrowKind, FormatArgPosition, FormatArgPositionKind, FormatArgsPiece, FormatArgumentKind, FormatCount,
     FormatOptions, FormatPlaceholder, Mutability,
 };
+use rustc_attr_ir::lang_items::LangItem;
+use rustc_attr_ir::{RustcVersion, find_attr};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::Applicability;
 use rustc_errors::SuggestionStyle::{CompletelyHidden, ShowCode};
-use rustc_hir::attrs::RustcVersion;
-use rustc_hir::attrs::lang_items::LangItem;
-use rustc_hir::{Expr, ExprKind, find_attr};
+use rustc_hir::{Expr, ExprKind};
 use rustc_lint::{LateContext, LateLintPass, LintContext as _, impl_lint_pass};
 use rustc_middle::ty::adjustment::{Adjust, Adjustment, DerefAdjustKind};
 use rustc_middle::ty::{self, GenericArg, List, TraitRef, Ty, TyCtxt, Unnormalized, Upcast as _};

clippy_lints/src/format_push_string.rs

@@ -3,8 +3,8 @@ use clippy_utils::macros::{FormatArgsStorage, format_args_inputs_span, root_macr
 use clippy_utils::res::MaybeDef as _;
 use clippy_utils::source::{snippet_with_applicability, snippet_with_context};
 use clippy_utils::{std_or_core, sym};
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::{AssignOpKind, Expr, ExprKind, MatchSource};
 use rustc_lint::{LateContext, LateLintPass, LintContext as _, impl_lint_pass};
 use rustc_span::Span;

clippy_lints/src/four_forward_slashes.rs

@@ -2,9 +2,9 @@ use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::source::SpanExt as _;
 use itertools::Itertools as _;
 use rustc_ast::AttrStyle;
+use rustc_attr_ir::{Attribute, AttributeKind};
 use rustc_errors::Applicability;
-use rustc_hir::attrs::AttributeKind;
-use rustc_hir::{Attribute, Item};
+use rustc_hir::Item;
 use rustc_lint::{LateContext, LateLintPass, LintContext as _, declare_lint_pass};
 use rustc_span::Span;
 

clippy_lints/src/from_str_radix_10.rs

@@ -2,8 +2,8 @@ use clippy_utils::diagnostics::span_lint_and_sugg;
 use clippy_utils::res::MaybeDef as _;
 use clippy_utils::sugg::Sugg;
 use clippy_utils::{is_in_const_context, is_integer_literal, sym};
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::{Expr, ExprKind, PrimTy, QPath, TyKind, def};
 use rustc_lint::{LateContext, LateLintPass, declare_lint_pass};
 use rustc_middle::ty::Ty;

clippy_lints/src/functions/must_use.rs

@@ -1,8 +1,9 @@
 use hir::FnSig;
+use rustc_attr_ir::find_attr;
 use rustc_errors::Applicability;
 use rustc_hir::def::Res;
 use rustc_hir::def_id::DefIdSet;
-use rustc_hir::{self as hir, Attribute, QPath, find_attr};
+use rustc_hir::{self as hir, Attribute, QPath};
 use rustc_lint::unused::must_use::MustUsePath;
 use rustc_lint::{LateContext, LintContext as _};
 use rustc_middle::ty::{self, Ty};

clippy_lints/src/incompatible_msrv.rs

@@ -2,9 +2,9 @@ use clippy_config::Conf;
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::msrvs::Msrv;
 use clippy_utils::{is_in_const_context, is_in_test, sym};
+use rustc_attr_ir::{RustcVersion, find_attr};
 use rustc_data_structures::fx::FxHashMap;
-use rustc_hir::attrs::RustcVersion;
-use rustc_hir::{self as hir, AmbigArg, Expr, ExprKind, HirId, StabilityLevel, StableSince, find_attr};
+use rustc_hir::{self as hir, AmbigArg, Expr, ExprKind, HirId, StabilityLevel, StableSince};
 use rustc_lint::{LateContext, LateLintPass, impl_lint_pass};
 use rustc_middle::ty::{self, TyCtxt};
 use rustc_span::def_id::{CrateNum, DefId};

clippy_lints/src/inherent_to_string.rs

@@ -3,7 +3,7 @@ use clippy_utils::res::MaybeDef as _;
 use clippy_utils::ty::implements_trait;
 use clippy_utils::{return_ty, trait_ref_of_method};
 use rustc_abi::ExternAbi;
-use rustc_hir::attrs::lang_items::LangItem;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_hir::{GenericParamKind, ImplItem, ImplItemKind};
 use rustc_lint::{LateContext, LateLintPass, declare_lint_pass};
 use rustc_span::sym;

clippy_lints/src/inline_fn_without_body.rs

@@ -1,7 +1,8 @@
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::sugg::DiagExt as _;
+use rustc_attr_ir::find_attr;
 use rustc_errors::Applicability;
-use rustc_hir::{TraitFn, TraitItem, TraitItemKind, find_attr};
+use rustc_hir::{TraitFn, TraitItem, TraitItemKind};
 use rustc_lint::{LateContext, LateLintPass, declare_lint_pass};
 
 declare_clippy_lint! {

clippy_lints/src/large_futures.rs

@@ -3,8 +3,8 @@ use clippy_utils::diagnostics::span_lint_and_sugg;
 use clippy_utils::source::snippet;
 use clippy_utils::ty::implements_trait;
 use rustc_abi::Size;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::{Expr, ExprKind, MatchSource};
 use rustc_lint::{LateContext, LateLintPass, impl_lint_pass};
 use rustc_middle::ty;

clippy_lints/src/lib.rs

@@ -26,6 +26,7 @@ extern crate rustc_abi;
 extern crate rustc_arena;
 extern crate rustc_ast;
 extern crate rustc_ast_pretty;
+extern crate rustc_attr_ir;
 extern crate rustc_data_structures;
 extern crate rustc_errors;
 extern crate rustc_hir;

clippy_lints/src/lifetimes.rs

@@ -4,10 +4,10 @@ use clippy_utils::msrvs::{self, Msrv};
 use clippy_utils::{is_from_proc_macro, trait_ref_of_method};
 use itertools::Itertools as _;
 use rustc_ast::visit::{try_visit, walk_list};
+use rustc_attr_ir::lang_items;
 use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
 use rustc_errors::Applicability;
 use rustc_hir::FnRetTy::Return;
-use rustc_hir::attrs::lang_items;
 use rustc_hir::intravisit::{
     IgnoreNested, NestedFilter, Visitor, VisitorExt as _, walk_fn_decl, walk_generic_args, walk_generic_param,
     walk_generics, walk_impl_item_ref, walk_param_bound, walk_poly_trait_ref, walk_trait_ref, walk_ty, walk_unambig_ty,

clippy_lints/src/loops/char_indices_as_byte_indices.rs

@@ -4,8 +4,8 @@ use clippy_utils::diagnostics::span_lint_hir_and_then;
 use clippy_utils::res::{MaybeDef as _, MaybeResPath as _};
 use clippy_utils::visitors::for_each_expr;
 use clippy_utils::{eq_expr_value, higher, sym};
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_errors::{Applicability, MultiSpan};
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::{Expr, ExprKind, Node, Pat, PatKind};
 use rustc_lint::LateContext;
 use rustc_middle::ty::Ty;

clippy_lints/src/loops/empty_loop.rs

@@ -2,7 +2,8 @@ use super::EMPTY_LOOP;
 use clippy_utils::diagnostics::span_lint_and_help;
 use clippy_utils::{is_in_panic_handler, is_no_std_crate};
 
-use rustc_hir::{Block, Expr, ItemKind, Node, find_attr};
+use rustc_attr_ir::find_attr;
+use rustc_hir::{Block, Expr, ItemKind, Node};
 use rustc_lint::LateContext;
 
 pub(super) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, loop_block: &Block<'_>) {

clippy_lints/src/loops/explicit_iter_loop.rs

@@ -8,8 +8,8 @@ use clippy_utils::ty::{
     implements_trait, implements_trait_with_env, is_copy, make_normalized_projection,
     make_normalized_projection_with_regions, normalize_with_regions,
 };
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_errors::Applicability;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::{Expr, Mutability};
 use rustc_lint::LateContext;
 use rustc_middle::ty::adjustment::{Adjust, Adjustment, AutoBorrow, AutoBorrowMutability};

clippy_lints/src/macro_metavars_in_unsafe.rs

@@ -2,9 +2,10 @@ use clippy_config::Conf;
 use clippy_utils::diagnostics::span_lint_hir_and_then;
 use clippy_utils::is_lint_allowed;
 use itertools::Itertools as _;
+use rustc_attr_ir::find_attr;
 use rustc_hir::def_id::LocalDefId;
 use rustc_hir::intravisit::{Visitor, walk_block, walk_expr, walk_stmt};
-use rustc_hir::{BlockCheckMode, Expr, ExprKind, HirId, Stmt, UnsafeSource, find_attr};
+use rustc_hir::{BlockCheckMode, Expr, ExprKind, HirId, Stmt, UnsafeSource};
 use rustc_lint::{LateContext, LateLintPass, LintContext as _, impl_lint_pass};
 use rustc_span::{Span, SyntaxContext};
 use std::collections::BTreeMap;