Auto merge of #148650 - GuillaumeGomez:rollup-p7esi5w, r=GuillaumeGomez

Rollup of 7 pull requests

Successful merges:

 - #145656 (Stabilize s390x `vector` target feature and `is_s390x_feature_detected!` macro)
 - #148204 (Modify contributor email entries in .mailmap)
 - #148556 (Fix suggestion for returning async closures)
 - #148585 ([rustdoc] Replace `print` methods with functions to improve code readability)
 - #148600 (re-use `self.get_all_attrs` result for pass indirectly attribute)
 - #148612 (Add note for identifier with attempted hygiene violation)
 - #148613 (Switch hexagon targets to rust-lld)

r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

.mailmap

@@ -9,7 +9,7 @@ Aaron Todd <[email protected]>
 Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
 Abhijeet Bhagat <[email protected]>
 Abroskin Alexander <[email protected]>
-Adolfo Ochagavía <[email protected]>
+Adolfo Ochagavía <[email protected]> <[email protected]>
 Adrian Heine né Lang <[email protected]>
 Adrien Tétar <[email protected]>
 Ahmed Charles <[email protected]> <[email protected]>
@@ -36,6 +36,7 @@ Amanda Stjerna <[email protected]> <[email protected]>
 Amanda Stjerna <[email protected]> <[email protected]>
 Amanieu d'Antras <[email protected]> <[email protected]>
 Amos Onn <[email protected]>
+Amos Wenger <[email protected]> <[email protected]>
 Ana-Maria Mihalache <[email protected]>
 Anatoly Ikorsky <[email protected]>
 Andre Bogus <[email protected]>
@@ -276,7 +277,8 @@ Irina Popa <[email protected]>
 Ivan Ivaschenko <[email protected]>
 ivan tkachenko <[email protected]>
 J. J. Weber <[email protected]>
-Jack Huey <[email protected]> <[email protected]>
+Jack Huey <[email protected]> <[email protected]>
+Jack Huey <[email protected]> <[email protected]>
 Jacob <[email protected]>
 Jacob Hoffman-Andrews <[email protected]> <[email protected]>
 Jacob Greenfield <[email protected]>
@@ -292,6 +294,8 @@ Jakub Adam Wieczorek <[email protected]>
 Jakub Adam Wieczorek <[email protected]> <[email protected]>
 Jakub Adam Wieczorek <[email protected]> <[email protected]>
 Jakub Adam Wieczorek <[email protected]> <[email protected]>
+Jakub Adam Wieczorek <[email protected]> <[email protected]>
+Jakub Adam Wieczorek <[email protected]> <[email protected]>
 Jakub Beránek <[email protected]> <[email protected]>
 James [Undefined] <[email protected]>
 James Deng <[email protected]> <[email protected]>
@@ -303,6 +307,7 @@ Jamie Hill-Daniel <[email protected]> <[email protected]>
 Jana Dönszelmann <[email protected]>
 Jana Dönszelmann <[email protected]> <[email protected]>
 Jana Dönszelmann <[email protected]> <[email protected]>
+Jane Lusby <[email protected]> <[email protected]>
 Jan-Erik Rediger <[email protected]> <[email protected]>
 Jaro Fietz <[email protected]>
 Jason Fager <[email protected]>
@@ -313,6 +318,7 @@ Jason Toffaletti <[email protected]> Jason Toffaletti <[email protected]>
 Jauhien Piatlicki <[email protected]> Jauhien Piatlicki <[email protected]>
 Jay True <[email protected]>
 Jeremy Letang <[email protected]>
+Jeremy Soller <[email protected]> <[email protected]>
 Jeremy Sorensen <[email protected]>
 Jeremy Stucki <[email protected]> <[email protected]>
 Jeremy Stucki <[email protected]> <[email protected]>
@@ -336,6 +342,7 @@ John Kåre Alsaker <[email protected]>
 John Kåre Alsaker <[email protected]> <[email protected]>
 John Talling <[email protected]>
 John Van Enk <[email protected]>
+Jon Gjengset <[email protected]> <[email protected]>
 Jonas Tepe <[email protected]>
 Jonathan Bailey <[email protected]> <[email protected]>
 Jonathan Chan Kwan Yin <[email protected]>
@@ -424,7 +431,7 @@ Malo Jaffré <[email protected]>
 Manish Goregaokar <[email protected]>
 Mara Bos <[email protected]>
 Marcell Pardavi <[email protected]>
-Marco Ieni <[email protected]>
+Marco Ieni <[email protected]> <[email protected]>
 Marcus Klaas de Vries <[email protected]>
 Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
 Marijn Schouten <[email protected]> <[email protected]>
@@ -531,6 +538,7 @@ Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]>
+Onur Özkan <[email protected]> <[email protected]>
 Onur Özkan <[email protected]> <[email protected]>
 Onur Özkan <[email protected]>
 Ömer Sinan Ağacan <[email protected]>
@@ -591,6 +599,7 @@ Rusty Blitzerr <[email protected]>
 RustyYato <[email protected]>
 Ruud van Asseldonk <[email protected]> Ruud van Asseldonk <[email protected]>
 Ryan Leung <[email protected]>
+Ryan Levick <[email protected]> <[email protected]>
 Ryan Scheel <[email protected]>
 Ryan Sullivant <[email protected]>
 Ryan Wiedemann <[email protected]>
@@ -686,6 +695,8 @@ Weihang Lo <[email protected]>
 Weihang Lo <[email protected]> <[email protected]>
 Wesley Wiser <[email protected]> <[email protected]>
 whitequark <[email protected]>
+Will Crichton <[email protected]> <[email protected]>
+Will Crichton <[email protected]> <[email protected]>
 William Ting <[email protected]> <[email protected]>
 Wim Looman <[email protected]> <[email protected]>
 Wim Looman <[email protected]> <[email protected]>
@@ -695,6 +706,8 @@ Xinye Tao <[email protected]>
 Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
 Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
 York Xiang <[email protected]>
+Yoshua Wuyts <[email protected]> <[email protected]>
+Yoshua Wuyts <[email protected]> <[email protected]>
 Yotam Ofek <[email protected]> <[email protected]>
 Youngsoo Son <[email protected]> <[email protected]>
 Youngsuk Kim <[email protected]>

compiler/rustc_feature/src/accepted.rs

@@ -387,6 +387,8 @@ declare_features! (
     (accepted, return_position_impl_trait_in_trait, "1.75.0", Some(91611)),
     /// Allows code like `let x: &'static u32 = &42` to work (RFC 1414).
     (accepted, rvalue_static_promotion, "1.21.0", Some(38865)),
+    /// Allows use of the `vector` and related s390x target features.
+    (accepted, s390x_target_feature_vector, "CURRENT_RUSTC_VERSION", Some(145649)),
     /// Allows `Self` in type definitions (RFC 2300).
     (accepted, self_in_typedefs, "1.32.0", Some(49303)),
     /// Allows `Self` struct constructor (RFC 2302).

compiler/rustc_hir_analysis/src/collect.rs

@@ -1263,6 +1263,21 @@ pub fn suggest_impl_trait<'tcx>(
             infcx.tcx.lang_items().future_output(),
             format_as_assoc,
         ),
+        (
+            infcx.tcx.lang_items().async_fn_trait(),
+            infcx.tcx.lang_items().async_fn_once_output(),
+            format_as_parenthesized,
+        ),
+        (
+            infcx.tcx.lang_items().async_fn_mut_trait(),
+            infcx.tcx.lang_items().async_fn_once_output(),
+            format_as_parenthesized,
+        ),
+        (
+            infcx.tcx.lang_items().async_fn_once_trait(),
+            infcx.tcx.lang_items().async_fn_once_output(),
+            format_as_parenthesized,
+        ),
         (
             infcx.tcx.lang_items().fn_trait(),
             infcx.tcx.lang_items().fn_once_output(),

compiler/rustc_middle/src/ty/mod.rs

@@ -1512,9 +1512,8 @@ impl<'tcx> TyCtxt<'tcx> {
             field_shuffle_seed ^= user_seed;
         }
 
-        if let Some(reprs) =
-            find_attr!(self.get_all_attrs(did), AttributeKind::Repr { reprs, .. } => reprs)
-        {
+        let attributes = self.get_all_attrs(did);
+        if let Some(reprs) = find_attr!(attributes, AttributeKind::Repr { reprs, .. } => reprs) {
             for (r, _) in reprs {
                 flags.insert(match *r {
                     attr::ReprRust => ReprFlags::empty(),
@@ -1574,10 +1573,7 @@ impl<'tcx> TyCtxt<'tcx> {
         }
 
         // See `TyAndLayout::pass_indirectly_in_non_rustic_abis` for details.
-        if find_attr!(
-            self.get_all_attrs(did),
-            AttributeKind::RustcPassIndirectlyInNonRusticAbis(..)
-        ) {
+        if find_attr!(attributes, AttributeKind::RustcPassIndirectlyInNonRusticAbis(..)) {
             flags.insert(ReprFlags::PASS_INDIRECTLY_IN_NON_RUSTIC_ABIS);
         }
 

compiler/rustc_resolve/src/late/diagnostics.rs

@@ -1125,6 +1125,8 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
                         }
                     }
                 }
+
+                self.suggest_ident_hidden_by_hygiene(err, path, span);
             } else if err_code == E0412 {
                 if let Some(correct) = Self::likely_rust_type(path) {
                     err.span_suggestion(
@@ -1138,6 +1140,28 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
         }
     }
 
+    fn suggest_ident_hidden_by_hygiene(&self, err: &mut Diag<'_>, path: &[Segment], span: Span) {
+        let [segment] = path else { return };
+
+        let ident = segment.ident;
+        let callsite_span = span.source_callsite();
+        for rib in self.ribs[ValueNS].iter().rev() {
+            for (binding_ident, _) in &rib.bindings {
+                if binding_ident.name == ident.name
+                    && !binding_ident.span.eq_ctxt(span)
+                    && !binding_ident.span.from_expansion()
+                    && binding_ident.span.lo() < callsite_span.lo()
+                {
+                    err.span_help(
+                        binding_ident.span,
+                        "an identifier with the same name exists, but is not accessible due to macro hygiene",
+                    );
+                    return;
+                }
+            }
+        }
+    }
+
     /// Emit special messages for unresolved `Self` and `self`.
     fn suggest_self_ty(
         &self,

compiler/rustc_span/src/symbol.rs

@@ -2000,6 +2000,7 @@ symbols! {
         s,
         s390x,
         s390x_target_feature,
+        s390x_target_feature_vector,
         safety,
         sanitize,
         sanitizer_cfi_generalize_pointers,

compiler/rustc_target/src/spec/targets/hexagon_unknown_linux_musl.rs

@@ -8,6 +8,7 @@ pub(crate) fn target() -> Target {
     base.features = "-small-data,+hvx-length128b".into();
 
     base.has_rpath = true;
+    base.linker = Some("rust-lld".into());
     base.linker_flavor = LinkerFlavor::Unix(Cc::Yes);
 
     base.c_enum_min_bits = Some(8);

compiler/rustc_target/src/spec/targets/hexagon_unknown_none_elf.rs

@@ -27,6 +27,7 @@ pub(crate) fn target() -> Target {
             max_atomic_width: Some(32),
             emit_debug_gdb_scripts: false,
             c_enum_min_bits: Some(8),
+            linker: Some("rust-lld".into()),
             ..Default::default()
         },
     }

compiler/rustc_target/src/target_features.rs

@@ -844,20 +844,20 @@ const IBMZ_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
     ("message-security-assist-extension8", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3"]),
     ("message-security-assist-extension9", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3", "message-security-assist-extension4"]),
     ("message-security-assist-extension12", Unstable(sym::s390x_target_feature), &[]),
-    ("miscellaneous-extensions-2", Unstable(sym::s390x_target_feature), &[]),
-    ("miscellaneous-extensions-3", Unstable(sym::s390x_target_feature), &[]),
-    ("miscellaneous-extensions-4", Unstable(sym::s390x_target_feature), &[]),
-    ("nnp-assist", Unstable(sym::s390x_target_feature), &["vector"]),
+    ("miscellaneous-extensions-2", Stable, &[]),
+    ("miscellaneous-extensions-3", Stable, &[]),
+    ("miscellaneous-extensions-4", Stable, &[]),
+    ("nnp-assist", Stable, &["vector"]),
     ("soft-float", Forbidden { reason: "currently unsupported ABI-configuration feature" }, &[]),
     ("transactional-execution", Unstable(sym::s390x_target_feature), &[]),
-    ("vector", Unstable(sym::s390x_target_feature), &[]),
-    ("vector-enhancements-1", Unstable(sym::s390x_target_feature), &["vector"]),
-    ("vector-enhancements-2", Unstable(sym::s390x_target_feature), &["vector-enhancements-1"]),
-    ("vector-enhancements-3", Unstable(sym::s390x_target_feature), &["vector-enhancements-2"]),
-    ("vector-packed-decimal", Unstable(sym::s390x_target_feature), &["vector"]),
-    ("vector-packed-decimal-enhancement", Unstable(sym::s390x_target_feature), &["vector-packed-decimal"]),
-    ("vector-packed-decimal-enhancement-2", Unstable(sym::s390x_target_feature), &["vector-packed-decimal-enhancement"]),
-    ("vector-packed-decimal-enhancement-3", Unstable(sym::s390x_target_feature), &["vector-packed-decimal-enhancement-2"]),
+    ("vector", Stable, &[]),
+    ("vector-enhancements-1", Stable, &["vector"]),
+    ("vector-enhancements-2", Stable, &["vector-enhancements-1"]),
+    ("vector-enhancements-3", Stable, &["vector-enhancements-2"]),
+    ("vector-packed-decimal", Stable, &["vector"]),
+    ("vector-packed-decimal-enhancement", Stable, &["vector-packed-decimal"]),
+    ("vector-packed-decimal-enhancement-2", Stable, &["vector-packed-decimal-enhancement"]),
+    ("vector-packed-decimal-enhancement-3", Stable, &["vector-packed-decimal-enhancement-2"]),
     // tidy-alphabetical-end
 ];
 

library/std/src/lib.rs

@@ -672,7 +672,7 @@ pub mod arch {
     pub use std_detect::is_loongarch_feature_detected;
     #[unstable(feature = "is_riscv_feature_detected", issue = "111192")]
     pub use std_detect::is_riscv_feature_detected;
-    #[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
+    #[stable(feature = "stdarch_s390x_feature_detection", since = "CURRENT_RUSTC_VERSION")]
     pub use std_detect::is_s390x_feature_detected;
     #[stable(feature = "simd_x86", since = "1.27.0")]
     pub use std_detect::is_x86_feature_detected;