Auto merge of #145388 - GuillaumeGomez:rollup-hnlt5ov, r=GuillaumeGomez

Rollup of 13 pull requests
Successful merges:
- #140434 (rustdoc: Allow multiple references to a single footnote)
- #142372 (Improve `--remap-path-prefix` documentation)
- #142741 (Fix unsoundness in some tests)
- #144515 (Implement `ptr_cast_array`)
- #144727 (Add tracing to resolve-related functions)
- #144959 (fix(unicode-table-generator): fix duplicated unique indices)
- #145179 (Avoid abbreviating "numerator" as "numer", to allow catching typo "numer" elsewhere)
- #145250 (Add regression test for a former ICE involving helper attributes containing interpolated tokens)
- #145266 (Reduce some queries around associated items)
- #145299 (doc test: fix mpsc.rs try_send doc test)
- #145323 (Port the `#[linkage]` attribute to the new attribute system)
- #145361 (Suppress wrapper suggestion when expected and actual ty are the same adt and the variant is unresolved)
- #145372 (resolve: Miscellaneous cleanups)
r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

compiler/rustc_attr_parsing/src/attributes/link_attrs.rs

@@ -1,6 +1,6 @@
 use rustc_feature::{AttributeTemplate, template};
-use rustc_hir::attrs::AttributeKind;
 use rustc_hir::attrs::AttributeKind::{LinkName,LinkOrdinal,LinkSection};
+use rustc_hir::attrs::{AttributeKind,Linkage};
 use rustc_span::{Span,Symbol, sym};
 
 usecrate::attributes::{
@@ -129,3 +129,77 @@ impl<S: Stage> SingleAttributeParser<S> for LinkOrdinalParser {
 Some(LinkOrdinal{ ordinal,span: cx.attr_span})
 }
 }
+
+pub(crate)structLinkageParser;
+
+impl<S:Stage>SingleAttributeParser<S>forLinkageParser{
+constPATH:&[Symbol] = &[sym::linkage];
+
+constATTRIBUTE_ORDER:AttributeOrder = AttributeOrder::KeepOutermost;
+
+constON_DUPLICATE:OnDuplicate<S> = OnDuplicate::Error;
+
+constTEMPLATE:AttributeTemplate = template!(NameValueStr:[
+"available_externally",
+"common",
+"extern_weak",
+"external",
+"internal",
+"linkonce",
+"linkonce_odr",
+"weak",
+"weak_odr",
+]);
+
+fnconvert(cx:&mutAcceptContext<'_,'_,S>,args:&ArgParser<'_>) -> Option<AttributeKind>{
+letSome(name_value) = args.name_value()else{
+ cx.expected_name_value(cx.attr_span,Some(sym::linkage));
+returnNone;
+};
+
+letSome(value) = name_value.value_as_str()else{
+ cx.expected_string_literal(name_value.value_span,Some(name_value.value_as_lit()));
+returnNone;
+};
+
+// Use the names from src/llvm/docs/LangRef.rst here. Most types are only
+// applicable to variable declarations and may not really make sense for
+// Rust code in the first place but allow them anyway and trust that the
+// user knows what they're doing. Who knows, unanticipated use cases may pop
+// up in the future.
+//
+// ghost, dllimport, dllexport and linkonce_odr_autohide are not supported
+// and don't have to be, LLVM treats them as no-ops.
+let linkage = match value {
+ sym::available_externally => Linkage::AvailableExternally,
+ sym::common => Linkage::Common,
+ sym::extern_weak => Linkage::ExternalWeak,
+ sym::external => Linkage::External,
+ sym::internal => Linkage::Internal,
+ sym::linkonce => Linkage::LinkOnceAny,
+ sym::linkonce_odr => Linkage::LinkOnceODR,
+ sym::weak => Linkage::WeakAny,
+ sym::weak_odr => Linkage::WeakODR,
+
+ _ => {
+ cx.expected_specific_argument(
+ name_value.value_span,
+vec![
+"available_externally",
+"common",
+"extern_weak",
+"external",
+"internal",
+"linkonce",
+"linkonce_odr",
+"weak",
+"weak_odr",
+],
+);
+returnNone;
+}
+};
+
+Some(AttributeKind::Linkage(linkage, cx.attr_span))
+}
+}

compiler/rustc_attr_parsing/src/context.rs

@@ -27,7 +27,7 @@ use crate::attributes::dummy::DummyParser;
 usecrate::attributes::inline::{InlineParser,RustcForceInlineParser};
 usecrate::attributes::link_attrs::{
 ExportStableParser,FfiConstParser,FfiPureParser,LinkNameParser,LinkOrdinalParser,
-LinkSectionParser,StdInternalSymbolParser,
+LinkSectionParser,LinkageParser,StdInternalSymbolParser,
 };
 usecrate::attributes::lint_helpers::{
 AsPtrParser,AutomaticallyDerivedParser,PassByValueParser,PubTransparentParser,
@@ -167,6 +167,7 @@ attribute_parsers!(
 Single<LinkNameParser>,
 Single<LinkOrdinalParser>,
 Single<LinkSectionParser>,
+Single<LinkageParser>,
 Single<MustUseParser>,
 Single<OptimizeParser>,
 Single<PathAttributeParser>,

compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

@@ -677,12 +677,13 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
 /// - is the trait from the local crate? If not, we can't suggest changing signatures
 /// - `Span` of the argument in the trait definition
 fnis_error_in_trait(&self,local:Local) -> (bool,bool,Option<Span>){
+let tcx = self.infcx.tcx;
 ifself.body.local_kind(local) != LocalKind::Arg{
 return(false,false,None);
 }
 let my_def = self.body.source.def_id();
 letSome(td) =
-self.infcx.tcx.impl_of_assoc(my_def).and_then(|x| self.infcx.tcx.trait_id_of_impl(x))
+ tcx.trait_impl_of_assoc(my_def).and_then(|id| self.infcx.tcx.trait_id_of_impl(id))
 else{
 return(false,false,None);
 };

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -1773,10 +1773,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
  locations,
 );
 
-assert!(!matches!(
- tcx.impl_of_assoc(def_id).map(|imp| tcx.def_kind(imp)),
-Some(DefKind::Impl{ of_trait:true})
-));
+assert_eq!(tcx.trait_impl_of_assoc(def_id),None);
 self.prove_predicates(
  args.types().map(|ty| ty::ClauseKind::WellFormed(ty.into())),
  locations,

compiler/rustc_codegen_cranelift/src/constant.rs

@@ -281,8 +281,8 @@ fn data_id_for_static(
 .abi
 .bytes();
 
-let linkage = if import_linkage == rustc_middle::mir::mono::Linkage::ExternalWeak
- || import_linkage == rustc_middle::mir::mono::Linkage::WeakAny
+let linkage = if import_linkage == rustc_hir::attrs::Linkage::ExternalWeak
+ || import_linkage == rustc_hir::attrs::Linkage::WeakAny
 {
 Linkage::Preemptible
 }else{
@@ -332,8 +332,8 @@ fn data_id_for_static(
 
 let linkage = if definition {
 crate::linkage::get_static_linkage(tcx, def_id)
-}elseif attrs.linkage == Some(rustc_middle::mir::mono::Linkage::ExternalWeak)
- || attrs.linkage == Some(rustc_middle::mir::mono::Linkage::WeakAny)
+}elseif attrs.linkage == Some(rustc_hir::attrs::Linkage::ExternalWeak)
+ || attrs.linkage == Some(rustc_hir::attrs::Linkage::WeakAny)
 {
 Linkage::Preemptible
 }else{

compiler/rustc_codegen_cranelift/src/driver/aot.rs

@@ -18,12 +18,11 @@ use rustc_codegen_ssa::{
 use rustc_data_structures::profiling::SelfProfilerRef;
 use rustc_data_structures::stable_hasher::{HashStable,StableHasher};
 use rustc_data_structures::sync::{IntoDynSyncSend, par_map};
+use rustc_hir::attrs::LinkageasRLinkage;
 use rustc_metadata::fs::copy_to_stdout;
 use rustc_middle::dep_graph::{WorkProduct,WorkProductId};
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
-use rustc_middle::mir::mono::{
-CodegenUnit,LinkageasRLinkage,MonoItem,MonoItemData,Visibility,
-};
+use rustc_middle::mir::mono::{CodegenUnit,MonoItem,MonoItemData,Visibility};
 use rustc_session::Session;
 use rustc_session::config::{DebugInfo,OutFileName,OutputFilenames,OutputType};
 

compiler/rustc_codegen_cranelift/src/linkage.rs

@@ -1,4 +1,5 @@
-use rustc_middle::mir::mono::{LinkageasRLinkage,MonoItem,Visibility};
+use rustc_hir::attrs::LinkageasRLinkage;
+use rustc_middle::mir::mono::{MonoItem,Visibility};
 
 usecrate::prelude::*;
 

compiler/rustc_codegen_gcc/src/base.rs

@@ -8,8 +8,8 @@ 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::DebugInfoCodegenMethods;
+use rustc_hir::attrs::Linkage;
 use rustc_middle::dep_graph;
-use rustc_middle::mir::mono::Linkage;
 #[cfg(feature = "master")]
 use rustc_middle::mir::mono::Visibility;
 use rustc_middle::ty::TyCtxt;

compiler/rustc_codegen_gcc/src/consts.rs

@@ -5,13 +5,13 @@ use rustc_abi::{self as abi, Align, HasDataLayout, Primitive, Size, WrappingRang
 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_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags,CodegenFnAttrs};
 use rustc_middle::mir::interpret::{
 self,ConstAllocation,ErrorHandled,ScalarasInterpScalar, read_target_uint,
 };
-use rustc_middle::mir::mono::Linkage;
 use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::{self,Instance};
 use rustc_middle::{bug, span_bug};

compiler/rustc_codegen_gcc/src/mono_item.rs

@@ -1,11 +1,12 @@
 #[cfg(feature = "master")]
 use gccjit::{FnAttribute,VarAttribute};
 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::bug;
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
-use rustc_middle::mir::mono::{Linkage,Visibility};
+use rustc_middle::mir::mono::Visibility;
 use rustc_middle::ty::layout::{FnAbiOf,HasTypingEnv,LayoutOf};
 use rustc_middle::ty::{self,Instance,TypeVisitableExt};