Auto merge of #157005 - JonathanBrouwer:rollup-1BZFgyy, r=JonathanBrouwer

Rollup of 9 pull requests

Successful merges:

 - #156796 (Fix missing suggestion when matching `String` with `&str`)
 - #156933 (rustc_parse_format: improve the error diagnostic for `+` sign flag)
 - #156545 (fix issue-144595)
 - #156814 (Extend macOS deployment target mismatch filter to cover dylib and new ld formats)
 - #156851 (rustdoc: avoid ICE when rendering body-less type consts)
 - #156942 (Remove unneeded `#[skip_arg]` attributes)
 - #156972 (add field_projections fixme)
 - #156975 (Move check_cfg out of diagnostic attr module)
 - #156989 (Add missing --set rust.codegen-backends=["gcc"] in the gcc codegen Dockerfile for the core tests)

Author: bors

compiler/rustc_attr_parsing/src/attributes/cfg.rs

@@ -20,7 +20,6 @@ use rustc_span::{ErrorGuaranteed, Span, Symbol, sym};
 use thin_vec::ThinVec;
 
 use crate::attributes::AttributeSafety;
-use crate::attributes::diagnostic::check_cfg;
 use crate::context::{AcceptContext, ShouldEmit};
 use crate::parser::{
     AllowExprMetavar, ArgParser, MetaItemListParser, MetaItemOrLitParser, NameValueParser,
@@ -29,7 +28,7 @@ use crate::session_diagnostics::{
     AttributeParseError, AttributeParseErrorReason, CfgAttrBadDelim, MetaBadDelimSugg,
     ParsedDescription,
 };
-use crate::{AttributeParser, parse_version, session_diagnostics};
+use crate::{AttributeParser, check_cfg, parse_version, session_diagnostics};
 
 pub const CFG_TEMPLATE: AttributeTemplate = template!(
     List: &["predicate"],

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

@@ -23,7 +23,6 @@ use crate::errors::{
 };
 use crate::parser::{ArgParser, MetaItemListParser, MetaItemOrLitParser, MetaItemParser};
 
-pub(crate) mod check_cfg;
 pub(crate) mod do_not_recommend;
 pub(crate) mod on_const;
 pub(crate) mod on_move;

…g/src/attributes/diagnostic/check_cfg.rs …iler/rustc_attr_parsing/src/check_cfg.rscompiler/rustc_attr_parsing/src/attributes/diagnostic/check_cfg.rs renamed to compiler/rustc_attr_parsing/src/check_cfg.rs compiler/rustc_attr_parsing/src/attributes/diagnostic/check_cfg.rs renamed to compiler/rustc_attr_parsing/src/check_cfg.rs

@@ -106,6 +106,7 @@ mod interface;
 /// like lists or name-value pairs.
 pub mod parser;
 
+mod check_cfg;
 mod early_parsed;
 mod errors;
 mod safety;

compiler/rustc_attr_parsing/src/lib.rs

@@ -274,11 +274,7 @@ pub(crate) enum IncorrectReprFormatGenericCause {
     Int {
         #[primary_span]
         span: Span,
-
-        #[skip_arg]
         name: Symbol,
-
-        #[skip_arg]
         value: u128,
     },
 
@@ -290,11 +286,7 @@ pub(crate) enum IncorrectReprFormatGenericCause {
     Symbol {
         #[primary_span]
         span: Span,
-
-        #[skip_arg]
         name: Symbol,
-
-        #[skip_arg]
         value: Symbol,
     },
 }

compiler/rustc_attr_parsing/src/session_diagnostics.rs

@@ -781,9 +781,15 @@ fn report_linker_output(
 
         // FIXME: Tracked by https://github.com/rust-lang/rust/issues/136113
         let deployment_mismatch = |line: &str| {
-            line.starts_with("ld: warning: object file (")
-                && line.contains("was built for newer 'macOS' version")
-                && line.contains("than being linked")
+            // ld64 (object files + dylibs) and ld_prime (object files only):
+            (line.starts_with("ld: ")
+                && line.contains("was built for newer")
+                && line.contains("than being linked"))
+            // ld_prime (Xcode 15+, dylibs only):
+            || (line.starts_with("ld: ")
+                && line.contains("building for")
+                && line.contains("but linking with")
+                && line.contains("which was built for newer version"))
         };
         // FIXME: This is a real warning we would like to show, but it hits too many crates
         // to want to turn it on immediately.

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -1007,7 +1007,22 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         //
         // then that's equivalent to there existing a LUB.
         let cause = self.pattern_cause(ti, span);
-        if let Err(err) = self.demand_suptype_with_origin(&cause, expected, pat_ty) {
+        if let Err(mut err) = self.demand_suptype_with_origin(&cause, expected, pat_ty) {
+            // If scrutinee is String and pattern is &str, suggest .as_str()
+            let expected = self.resolve_vars_with_obligations(expected);
+            if let ty::Adt(adt, _) = expected.kind()
+                && self.tcx.is_lang_item(adt.did(), LangItem::String)
+                && pat_ty.is_ref()
+                && pat_ty.peel_refs().is_str()
+                && let Some(origin_expr) = ti.origin_expr
+            {
+                err.span_suggestion_verbose(
+                    origin_expr.span.shrink_to_hi(),
+                    "consider converting the `String` to a `&str` using `.as_str()`",
+                    ".as_str()",
+                    Applicability::MachineApplicable,
+                );
+            }
             err.emit();
         }
 

compiler/rustc_hir_typeck/src/pat.rs

@@ -898,6 +898,8 @@ where
                         predicate: TraitRef::new(ecx.cx(), sized_trait, [ty]).upcast(ecx.cx()),
                     },
                 );
+                // FIXME(field_projections): This function does some questionable incomplete stuff by
+                // returning `Err(NoSolution)` on ambiguity.
                 ecx.try_evaluate_added_goals()? == Certainty::Yes
             }
             && match base.kind() {

compiler/rustc_next_trait_solver/src/solve/trait_goals.rs

@@ -4639,3 +4639,28 @@ pub(crate) struct ReservedMultihashLint {
     )]
     pub suggestion: Span,
 }
+
+#[derive(Subdiagnostic)]
+#[suggestion(
+    "if you meant to write a path, use a double colon:",
+    code = "::",
+    applicability = "maybe-incorrect"
+)]
+pub(crate) struct UseDoubleColonSuggestion {
+    #[primary_span]
+    pub colon: Span,
+}
+
+#[derive(Subdiagnostic)]
+#[multipart_suggestion(
+    "if you meant to create a regular struct, use curly braces:",
+    applicability = "maybe-incorrect"
+)]
+pub(crate) struct UseRegularStructSuggestion {
+    #[suggestion_part(code = "{{")]
+    pub open: Span,
+    #[suggestion_part(code = "}}")]
+    pub close: Span,
+    #[suggestion_part(code = "")]
+    pub semicolon: Option<Span>,
+}

compiler/rustc_parse/src/errors.rs

@@ -23,7 +23,10 @@ use super::{
     AllowConstBlockItems, AttrWrapper, ExpKeywordPair, ExpTokenPair, FollowedByType, ForceCollect,
     Parser, PathStyle, Recovered, Trailing, UsePreAttrPos,
 };
-use crate::errors::{self, FnPointerCannotBeAsync, FnPointerCannotBeConst, MacroExpandsToAdtField};
+use crate::errors::{
+    self, FnPointerCannotBeAsync, FnPointerCannotBeConst, MacroExpandsToAdtField,
+    UseDoubleColonSuggestion, UseRegularStructSuggestion,
+};
 use crate::exp;
 
 impl<'a> Parser<'a> {
@@ -2084,10 +2087,11 @@ impl<'a> Parser<'a> {
             Safety::Default
         }
     }
-
+    /// This is the case where we find `struct Foo<T>(T) where T: Copy;`
+    /// Unit like structs are handled in parse_item_struct function
     pub(super) fn parse_tuple_struct_body(&mut self) -> PResult<'a, ThinVec<FieldDef>> {
-        // This is the case where we find `struct Foo<T>(T) where T: Copy;`
-        // Unit like structs are handled in parse_item_struct function
+        let openparen_span = self.token.span;
+        let mut encountered_colon = false;
         self.parse_paren_comma_seq(|p| {
             let attrs = p.parse_outer_attributes()?;
             p.collect_tokens(None, attrs, ForceCollect::No, |p, attrs| {
@@ -2109,6 +2113,8 @@ impl<'a> Parser<'a> {
                     }
                 };
                 let mut_restriction = p.parse_mut_restriction()?;
+                encountered_colon |=
+                    p.token.is_ident() && p.look_ahead(1, |tok| tok == &token::Colon);
                 // Unsafe fields are not supported in tuple structs, as doing so would result in a
                 // parsing ambiguity for `struct X(unsafe fn())`.
                 let ty = match p.parse_ty() {
@@ -2156,6 +2162,19 @@ impl<'a> Parser<'a> {
             })
         })
         .map(|(r, _)| r)
+        .map_err(|mut error| {
+            if encountered_colon {
+                error.subdiagnostic(UseDoubleColonSuggestion { colon: self.token.span });
+                self.eat_to_tokens(&[exp!(CloseParen)]);
+                self.bump();
+                error.subdiagnostic(UseRegularStructSuggestion {
+                    open: openparen_span,
+                    close: self.prev_token.span,
+                    semicolon: if self.token == token::Semi { Some(self.token.span) } else { None },
+                });
+            }
+            error
+        })
     }
 
     /// Parses an element of a struct declaration.