Rollup of 3 pull requests

.mailmap

@@ -144,6 +144,9 @@ Christian Poveda <git@pvdrz.com> <31802960+christianpoveda@users.noreply.github.
 Christian Poveda <git@pvdrz.com> <christianpoveda@uhura.edef.eu>
 Christian Vallentin <vallentinsource@gmail.com>
 Christoffer Buchholz <chris@chrisbuchholz.me>
+Clar Fon <usr@ltdk.xyz>
+Clar Fon <usr@ltdk.xyz> <clar@charr.xyz>
+Clar Fon <usr@ltdk.xyz> <them@lightdark.xyz>
 Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com>
 Clement Miao <clementmiao@gmail.com>
 Clément Renault <renault.cle@gmail.com>

Cargo.lock

@@ -3734,6 +3734,7 @@ dependencies = [
  "itertools",
  "polonius-engine",
  "rustc_abi",
+ "rustc_attr_ir",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_graphviz",
@@ -4181,6 +4182,7 @@ dependencies = [
  "itertools",
  "rustc_abi",
  "rustc_ast",
+ "rustc_attr_ir",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
@@ -4266,6 +4268,7 @@ dependencies = [
  "rustc_ast_lowering",
  "rustc_ast_passes",
  "rustc_ast_pretty",
+ "rustc_attr_ir",
  "rustc_attr_parsing",
  "rustc_borrowck",
  "rustc_builtin_macros",
@@ -4477,6 +4480,7 @@ dependencies = [
  "rustc_apfloat",
  "rustc_arena",
  "rustc_ast",
+ "rustc_attr_ir",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
@@ -4519,6 +4523,7 @@ dependencies = [
  "rustc_abi",
  "rustc_arena",
  "rustc_ast",
+ "rustc_attr_ir",
  "rustc_const_eval",
  "rustc_data_structures",
  "rustc_errors",
@@ -4703,6 +4708,7 @@ name = "rustc_public_bridge"
 version = "0.0.0"
 dependencies = [
  "rustc_abi",
+ "rustc_attr_ir",
  "rustc_crate_store",
  "rustc_data_structures",
  "rustc_hir",
@@ -4767,6 +4773,7 @@ dependencies = [
  "bitflags",
  "libc",
  "rustc_abi",
+ "rustc_attr_ir",
  "rustc_data_structures",
  "rustc_hir",
  "rustc_middle",

compiler/rustc_ast_pretty/src/pprust/state.rs

@@ -621,7 +621,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
             // Isolated, starts with #! and doesn't continue with `[`
             // See [rustc_lexer::strip_shebang] and [gather_comments] from pprust/state.rs for details
             if cmnt.style == CommentStyle::Isolated
-                && cmnt.lines.first().map_or(false, |l| l.starts_with("#!"))
+                && cmnt.lines.first().is_some_and(|l| l.starts_with("#!"))
             {
                 let cmnt = self.next_comment().unwrap();
                 self.print_comment(cmnt);

compiler/rustc_borrowck/Cargo.toml

@@ -9,6 +9,7 @@ either = "1.5.0"
 itertools = "0.15"
 polonius-engine = "0.13.0"
 rustc_abi = { path = "../rustc_abi" }
+rustc_attr_ir = { path = "../rustc_attr_ir" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
 rustc_graphviz = { path = "../rustc_graphviz" }

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -5,15 +5,16 @@ use std::ops::ControlFlow;
 
 use either::Either;
 use hir::{ClosureKind, Path};
+use rustc_attr_ir::diagnostic::{CustomDiagnostic, FormatArgs};
+use rustc_attr_ir::find_attr;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_data_structures::fx::FxIndexSet;
 use rustc_errors::codes::*;
 use rustc_errors::{Applicability, Diag, MultiSpan, struct_span_code_err};
 use rustc_hir as hir;
-use rustc_hir::attrs::diagnostic::{CustomDiagnostic, FormatArgs};
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::intravisit::{Visitor, walk_block, walk_expr};
-use rustc_hir::{CoroutineDesugaring, CoroutineKind, CoroutineSource, PatField, find_attr};
+use rustc_hir::{CoroutineDesugaring, CoroutineKind, CoroutineSource, PatField};
 use rustc_index::bit_set::DenseBitSet;
 use rustc_infer::traits::TraitErrors;
 use rustc_middle::hir::nested_filter::OnlyBodies;

compiler/rustc_borrowck/src/diagnostics/mod.rs

@@ -3,10 +3,10 @@
 use std::collections::BTreeMap;
 
 use rustc_abi::{FieldIdx, VariantIdx};
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_errors::formatting::DiagMessageAddArg;
 use rustc_errors::{Applicability, Diag, DiagMessage, MultiSpan, listify, msg};
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::def::{CtorKind, Namespace};
 use rustc_hir::{
     self as hir, CoroutineKind, GenericBound, WhereBoundPredicate, WherePredicateKind,

compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

@@ -3,8 +3,8 @@ use core::ops::ControlFlow;
 use either::Either;
 use hir::{ExprKind, Param};
 use rustc_abi::FieldIdx;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_errors::{Applicability, Diag};
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::{self as hir, BindingMode, ByRef, Expr, Node};

compiler/rustc_borrowck/src/lib.rs

@@ -347,7 +347,7 @@ fn borrowck_collect_region_constraints<'tcx>(
 
     let location_map = Rc::new(DenseLocationMap::new(body));
 
-    let polonius_input = root_cx.consumer.as_ref().map_or(false, |c| c.polonius_input())
+    let polonius_input = root_cx.consumer.as_ref().is_some_and(|c| c.polonius_input())
         || infcx.tcx.sess.opts.unstable_opts.polonius.is_legacy_enabled();
     let mut polonius_facts =
         (polonius_input || PoloniusFacts::enabled(infcx.tcx)).then_some(PoloniusFacts::default());

compiler/rustc_borrowck/src/nll.rs

@@ -6,8 +6,8 @@ use std::rc::Rc;
 use std::str::FromStr;
 
 use polonius_engine::{Algorithm, AllFacts, Output};
+use rustc_attr_ir::find_attr;
 use rustc_data_structures::frozen::Frozen;
-use rustc_hir::find_attr;
 use rustc_index::IndexSlice;
 use rustc_middle::mir::pretty::PrettyPrintMirOptions;
 use rustc_middle::mir::{Body, MirDumper, PassWhere, Promoted};

compiler/rustc_borrowck/src/polonius/liveness.rs

@@ -52,7 +52,7 @@ impl<'a> RegionLiveness<'a> {
     }
 
     pub(super) fn is_live_at(&self, point: PointIndex) -> bool {
-        self.live_points.map_or(false, |points| points.contains(point))
+        self.live_points.is_some_and(|points| points.contains(point))
     }
 }
 

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -4,11 +4,11 @@ use std::rc::Rc;
 use std::{fmt, iter, mem};
 
 use rustc_abi::FieldIdx;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_data_structures::frozen::Frozen;
 use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
 use rustc_errors::ErrorGuaranteed;
 use rustc_hir as hir;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::LocalDefId;
 use rustc_index::{IndexSlice, IndexVec};

compiler/rustc_borrowck/src/universal_regions.rs

@@ -14,10 +14,10 @@
 use std::cell::Cell;
 use std::iter;
 
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_errors::Diag;
 use rustc_hir::BodyOwnerKind;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{DefId, LocalDefId};
 use rustc_index::IndexVec;

compiler/rustc_codegen_cranelift/src/base.rs

@@ -5,10 +5,10 @@ use cranelift_codegen::ir::UserFuncName;
 use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext};
 use cranelift_module::ModuleError;
 use rustc_ast::InlineAsmOptions;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_codegen_ssa::base::is_call_from_compiler_builtins_to_upstream_monomorphization;
 use rustc_data_structures::profiling::SelfProfilerRef;
 use rustc_errors::DiagCtxtHandle;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_index::IndexVec;
 use rustc_middle::ty::TypeVisitableExt;
 use rustc_middle::ty::adjustment::PointerCoercion;

compiler/rustc_codegen_cranelift/src/constant.rs

@@ -293,8 +293,8 @@ fn data_id_for_static(
             .abi
             .bytes();
 
-        let linkage = if import_linkage == rustc_hir::attrs::Linkage::ExternalWeak
-            || import_linkage == rustc_hir::attrs::Linkage::WeakAny
+        let linkage = if import_linkage == rustc_attr_ir::Linkage::ExternalWeak
+            || import_linkage == rustc_attr_ir::Linkage::WeakAny
         {
             Linkage::Preemptible
         } else {
@@ -344,8 +344,8 @@ fn data_id_for_static(
 
     let linkage = if definition {
         crate::linkage::get_static_linkage(tcx, def_id)
-    } else if attrs.linkage == Some(rustc_hir::attrs::Linkage::ExternalWeak)
-        || attrs.linkage == Some(rustc_hir::attrs::Linkage::WeakAny)
+    } else if attrs.linkage == Some(rustc_attr_ir::Linkage::ExternalWeak)
+        || attrs.linkage == Some(rustc_attr_ir::Linkage::WeakAny)
     {
         Linkage::Preemptible
     } else {

compiler/rustc_codegen_cranelift/src/driver/aot.rs

@@ -10,6 +10,7 @@ use std::time::Instant;
 
 use cranelift_object::{ObjectBuilder, ObjectModule};
 use rustc_ast::expand::allocator::AllocatorMethod;
+use rustc_attr_ir::Linkage as RLinkage;
 use rustc_codegen_ssa::back::lto::ThinModule;
 use rustc_codegen_ssa::back::write::{
     CodegenContext, FatLtoInput, ModuleConfig, SharedEmitter, TargetMachineFactoryFn, ThinLtoInput,
@@ -18,7 +19,6 @@ use rustc_codegen_ssa::traits::{ExtraBackendMethods, WriteBackendMethods};
 use rustc_codegen_ssa::{CompiledModule, ModuleCodegen, ModuleKind};
 use rustc_data_structures::profiling::SelfProfilerRef;
 use rustc_errors::{DiagCtxt, DiagCtxtHandle};
-use rustc_hir::attrs::Linkage as RLinkage;
 use rustc_middle::dep_graph::WorkProduct;
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::mono::{MonoItem, MonoItemData, Visibility};

compiler/rustc_codegen_cranelift/src/inline_asm.rs

@@ -5,7 +5,7 @@ use std::fmt::Write;
 use cranelift_codegen::isa::CallConv;
 use rustc_abi::CanonAbi;
 use rustc_ast::ast::{InlineAsmOptions, InlineAsmTemplatePiece};
-use rustc_hir::attrs::lang_items::LangItem;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_middle::mir::interpret::{GlobalAlloc, PointerArithmetic, Scalar as ConstScalar};
 use rustc_middle::ty::layout::FnAbiOf;
 use rustc_span::sym;

compiler/rustc_codegen_cranelift/src/lib.rs

@@ -12,6 +12,7 @@
 
 extern crate rustc_abi;
 extern crate rustc_ast;
+extern crate rustc_attr_ir;
 extern crate rustc_codegen_ssa;
 extern crate rustc_const_eval;
 extern crate rustc_data_structures;

compiler/rustc_codegen_cranelift/src/linkage.rs

@@ -1,4 +1,4 @@
-use rustc_hir::attrs::Linkage as RLinkage;
+use rustc_attr_ir::Linkage as RLinkage;
 use rustc_middle::mono::{MonoItem, Visibility};
 
 use crate::prelude::*;

compiler/rustc_codegen_cranelift/src/main_shim.rs

@@ -1,5 +1,5 @@
 use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext};
-use rustc_hir::attrs::lang_items::LangItem;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_middle::ty::{AssocTag, GenericArg, Unnormalized};
 use rustc_session::config::EntryFnType;
 use rustc_span::{DUMMY_SP, Ident};

compiler/rustc_codegen_gcc/src/attributes.rs

@@ -4,8 +4,8 @@ use gccjit::Function;
 #[cfg(feature = "master")]
 use rustc_abi::{CanonAbi, InterruptKind};
 #[cfg(feature = "master")]
-use rustc_hir::attrs::InlineAttr;
-use rustc_hir::attrs::InstructionSetAttr;
+use rustc_attr_ir::InlineAttr;
+use rustc_attr_ir::InstructionSetAttr;
 #[cfg(feature = "master")]
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 #[cfg(feature = "master")]

compiler/rustc_codegen_gcc/src/base.rs

@@ -4,11 +4,10 @@ use std::time::Instant;
 #[cfg(feature = "master")]
 use gccjit::VarAttribute;
 use gccjit::{CType, FunctionType, GlobalKind};
+use rustc_attr_ir::{AttributeKind, Linkage, find_attr};
 use rustc_codegen_ssa::ModuleCodegen;
 use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
 use rustc_codegen_ssa::mono_item::MonoItemExt;
-use rustc_hir::attrs::{AttributeKind, Linkage};
-use rustc_hir::find_attr;
 use rustc_middle::dep_graph;
 #[cfg(feature = "master")]
 use rustc_middle::mono::Visibility;

compiler/rustc_codegen_gcc/src/callee.rs

@@ -106,7 +106,7 @@ pub fn get_fn<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, instance: Instance<'tcx>)
                 // This is a monomorphization of a generic function.
                 if !(cx.tcx.sess.opts.share_generics()
                     || tcx.codegen_instance_attrs(instance.def).inline
-                        == rustc_hir::attrs::InlineAttr::Never)
+                        == rustc_attr_ir::InlineAttr::Never)
                 {
                     // When not sharing generics, all instances are in the same
                     // crate and have hidden visibility.

compiler/rustc_codegen_gcc/src/consts.rs

@@ -4,10 +4,10 @@ use std::ops::Range;
 use gccjit::{FnAttribute, VarAttribute, Visibility};
 use gccjit::{Function, GlobalKind, LValue, RValue, ToRValue, Type};
 use rustc_abi::{self as abi, Align, HasDataLayout, Primitive, Size, WrappingRange};
+use rustc_attr_ir::Linkage;
 use rustc_codegen_ssa::traits::{
     BaseTypeCodegenMethods, ConstCodegenMethods, StaticCodegenMethods,
 };
-use rustc_hir::attrs::Linkage;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_log::tracing::trace;

compiler/rustc_codegen_gcc/src/lib.rs

@@ -25,6 +25,7 @@
 extern crate rustc_abi;
 extern crate rustc_apfloat;
 extern crate rustc_ast;
+extern crate rustc_attr_ir;
 extern crate rustc_codegen_ssa;
 extern crate rustc_data_structures;
 extern crate rustc_errors;

compiler/rustc_codegen_gcc/src/mono_item.rs

@@ -1,8 +1,8 @@
 use gccjit::Function;
 #[cfg(feature = "master")]
 use gccjit::{FnAttribute, GlobalKind, ToRValue, Type, VarAttribute};
+use rustc_attr_ir::Linkage;
 use rustc_codegen_ssa::traits::PreDefineCodegenMethods;
-use rustc_hir::attrs::Linkage;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};

compiler/rustc_codegen_llvm/src/base.rs

@@ -13,12 +13,12 @@
 
 use std::time::Instant;
 
+use rustc_attr_ir::Linkage;
 use rustc_codegen_ssa::ModuleCodegen;
 use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
 use rustc_codegen_ssa::mono_item::MonoItemExt;
 use rustc_codegen_ssa::traits::*;
 use rustc_data_structures::small_c_str::SmallCStr;
-use rustc_hir::attrs::Linkage;
 use rustc_middle::dep_graph;
 use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrs, SanitizerFnAttrs};
 use rustc_middle::mono::Visibility;

compiler/rustc_codegen_llvm/src/builder.rs

@@ -8,13 +8,13 @@ pub(crate) mod gpu_offload;
 
 use libc::{c_char, c_uint};
 use rustc_abi::{self as abi, Align, CanonAbi, Size, WrappingRange};
+use rustc_attr_ir::{AttributeKind, UnrollAttr};
 use rustc_codegen_ssa::MemFlags;
 use rustc_codegen_ssa::common::{IntPredicate, RealPredicate, SynchronizationScope, TypeKind};
 use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
 use rustc_codegen_ssa::mir::place::PlaceRef;
 use rustc_codegen_ssa::traits::*;
 use rustc_data_structures::small_c_str::SmallCStr;
-use rustc_hir::attrs::{AttributeKind, UnrollAttr};
 use rustc_hir::def_id::DefId;
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrs;
 use rustc_middle::ty::layout::{

compiler/rustc_codegen_llvm/src/builder/autodiff.rs

@@ -2,13 +2,13 @@ use std::ptr;
 
 use rustc_ast::expand::autodiff_attrs::{DiffActivity, DiffMode};
 use rustc_ast::expand::typetree::FncTree;
+use rustc_attr_ir::RustcAutodiff;
 use rustc_codegen_ssa::common::TypeKind;
 use rustc_codegen_ssa::mir::IntrinsicResult;
 use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
 use rustc_codegen_ssa::mir::place::PlaceValue;
 use rustc_codegen_ssa::traits::{BaseTypeCodegenMethods, BuilderMethods, ReturnSlot};
 use rustc_data_structures::thin_vec::ThinVec;
-use rustc_hir::attrs::RustcAutodiff;
 use rustc_middle::ty;
 use rustc_middle::ty::{PseudoCanonicalInput, Ty, TyCtxt, TypingEnv};
 use rustc_span::bug;

compiler/rustc_codegen_llvm/src/callee.rs

@@ -4,6 +4,7 @@
 //! and methods are represented as just a fn ptr and not a full
 //! closure.
 
+use rustc_attr_ir::InlineAttr;
 use rustc_codegen_ssa::common;
 use rustc_middle::ty::layout::{FnAbiOf, HasTyCtxt, HasTypingEnv};
 use rustc_middle::ty::{self, Instance, TypeVisitableExt};
@@ -98,8 +99,7 @@ pub(crate) fn get_fn<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'t
         let is_hidden = if is_generic {
             // This is a monomorphization of a generic function.
             if !(cx.tcx.sess.opts.share_generics()
-                || tcx.codegen_instance_attrs(instance.def).inline
-                    == rustc_hir::attrs::InlineAttr::Never)
+                || tcx.codegen_instance_attrs(instance.def).inline == InlineAttr::Never)
             {
                 // When not sharing generics, all instances are in the same
                 // crate and have hidden visibility.

compiler/rustc_codegen_llvm/src/consts.rs

@@ -1,10 +1,10 @@
 use std::ops::Range;
 
 use rustc_abi::{Align, ExternAbi, HasDataLayout, Primitive, Scalar, Size, WrappingRange};
+use rustc_attr_ir::Linkage;
+use rustc_attr_ir::lang_items::LangItem;
 use rustc_codegen_ssa::common;
 use rustc_codegen_ssa::traits::*;
-use rustc_hir::attrs::Linkage;
-use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};