Rollup of 7 pull requests

compiler/rustc_attr_parsing/src/attributes/lint.rs

@@ -7,7 +7,7 @@ use thin_vec::ThinVec;
 
 use crate::attributes::{AcceptMapping, AttributeParser, AttributeStability};
 use crate::context::{AcceptContext, ExpectStringLiteral, FinalizeContext};
-use crate::parser::ArgParser;
+use crate::parser::{ArgParser, MetaItemOrLitParser};
 use crate::target_checking::AllowedTargets;
 use crate::target_checking::Policy::{Allow, Warn};
 use crate::{AttributeTemplate, diagnostics, template};
@@ -37,7 +37,7 @@ impl LintParser {
                 if !p.path().word_is(sym::reason) {
                     cx.emit_err(diagnostics::MalformedAttribute {
                         span: p.span(),
-                        sub: diagnostics::MalformedAttributeSub::BadAttributeArgument(p.span()),
+                        kind: diagnostics::MalformedAttributeKind::BadAttributeArgument(p.span()),
                     });
                 } else {
                     parsers = &parsers[..(parsers.len() - 1)];
@@ -48,58 +48,70 @@ impl LintParser {
             };
 
             for item in parsers {
-                if let Some(p) = item.meta_item() {
-                    match p.args() {
-                        ArgParser::NoArgs => {
-                            let (tool, lint_name, rest) = match &*p.path().0.segments {
-                                [] => unreachable!(),
-                                [lint_name] => (None, lint_name.ident.name, None),
-                                [tool, lint_name] => (Some(tool.ident), lint_name.ident.name, None),
-                                [tool, lint_name, rest @ ..] => {
-                                    let rest = rest
-                                        .iter()
-                                        .map(|s| s.ident.name)
-                                        .collect::<Vec<_>>()
-                                        .into();
-                                    (Some(tool.ident), lint_name.ident.name, Some(rest))
-                                }
-                            };
+                match item {
+                    MetaItemOrLitParser::MetaItemParser(p) => {
+                        match p.args() {
+                            ArgParser::NoArgs => {
+                                let (tool, lint_name, rest) = match &*p.path().0.segments {
+                                    [] => unreachable!(),
+                                    [lint_name] => (None, lint_name.ident.name, None),
+                                    [tool, lint_name] => {
+                                        (Some(tool.ident), lint_name.ident.name, None)
+                                    }
+                                    [tool, lint_name, rest @ ..] => {
+                                        let rest = rest
+                                            .iter()
+                                            .map(|s| s.ident.name)
+                                            .collect::<Vec<_>>()
+                                            .into();
+                                        (Some(tool.ident), lint_name.ident.name, Some(rest))
+                                    }
+                                };
 
-                            self.lints.push(LintCheck {
-                                tool,
-                                lint_name,
-                                lint_span: p.span(),
-                                kind,
-                                attr_id,
-                                reason,
-                                attr_span,
-                                rest,
-                            })
-                        }
-                        // We're found a `reason = "reason"` but we're not the last element.
-                        ArgParser::NameValue(nv) if p.path().word_is(sym::reason) => {
-                            cx.emit_err(diagnostics::MalformedAttribute {
-                                span: p.span(),
-                                sub: diagnostics::MalformedAttributeSub::ReasonMustComeLast(
-                                    item.span(),
-                                ),
-                            });
-                            nv.expect_string_literal(cx);
-                        }
-                        ArgParser::NameValue(_) | ArgParser::List(_) => {
-                            cx.emit_err(diagnostics::MalformedAttribute {
-                                span: p.span(),
-                                sub: diagnostics::MalformedAttributeSub::BadAttributeArgument(
-                                    item.span(),
-                                ),
-                            });
+                                self.lints.push(LintCheck {
+                                    tool,
+                                    lint_name,
+                                    lint_span: p.span(),
+                                    kind,
+                                    attr_id,
+                                    reason,
+                                    attr_span,
+                                    rest,
+                                })
+                            }
+                            // We've found a `reason = "reason"` but we're not the last element.
+                            ArgParser::NameValue(nv) if p.path().word_is(sym::reason) => {
+                                cx.emit_err(diagnostics::MalformedAttribute {
+                                    span: p.span(),
+                                    kind: diagnostics::MalformedAttributeKind::ReasonMustComeLast(
+                                        item.span(),
+                                    ),
+                                });
+                                nv.expect_string_literal(cx);
+                            }
+                            ArgParser::NameValue(_) | ArgParser::List(_) => {
+                                cx.emit_err(diagnostics::MalformedAttribute {
+                                    span: p.span(),
+                                    kind: diagnostics::MalformedAttributeKind::BadAttributeArgument(
+                                        item.span(),
+                                    ),
+                                });
+                            }
                         }
                     }
-                } else {
-                    cx.emit_err(diagnostics::MalformedAttribute {
-                        span: item.span(),
-                        sub: diagnostics::MalformedAttributeSub::BadAttributeArgument(item.span()),
-                    });
+                    MetaItemOrLitParser::Lit(lit) => {
+                        cx.emit_err(diagnostics::BadAttributeLit {
+                            span: item.span(),
+                            help: if lit.kind.is_str() {
+                                diagnostics::BadAttributeLitHelp::StrLit {
+                                    sym: lit.symbol,
+                                    kind: kind.sym(),
+                                }
+                            } else {
+                                diagnostics::BadAttributeLitHelp::Other { kind: kind.sym() }
+                            },
+                        });
+                    }
                 }
             }
             if parsers.is_empty() {

compiler/rustc_attr_parsing/src/diagnostics.rs

@@ -2139,17 +2139,35 @@ pub(crate) struct MalformedAttribute {
     #[primary_span]
     pub span: Span,
     #[subdiagnostic]
-    pub sub: MalformedAttributeSub,
+    pub kind: MalformedAttributeKind,
 }
 
 #[derive(Subdiagnostic)]
-pub(crate) enum MalformedAttributeSub {
+pub(crate) enum MalformedAttributeKind {
     #[label("bad attribute argument")]
     BadAttributeArgument(#[primary_span] Span),
     #[label("reason in lint attribute must come last")]
     ReasonMustComeLast(#[primary_span] Span),
 }
 
+#[derive(Diagnostic)]
+#[diag("expected a lint, found literal")]
+pub(crate) struct BadAttributeLit {
+    #[primary_span]
+    #[label("not the name of a lint")]
+    pub span: Span,
+    #[subdiagnostic]
+    pub help: BadAttributeLitHelp,
+}
+
+#[derive(Subdiagnostic)]
+pub(crate) enum BadAttributeLitHelp {
+    #[help("try using `#[{$kind}({$sym})]`")]
+    StrLit { sym: Symbol, kind: Symbol },
+    #[help("for example, write `#[{$kind}(dead_code)]` for `dead_code`")]
+    Other { kind: Symbol },
+}
+
 #[derive(Subdiagnostic)]
 pub(crate) enum UnusedNote {
     #[note("attribute `{$name}` with an empty list has no effect")]

library/alloc/src/io/copy.rs

@@ -75,6 +75,7 @@ pub enum CopyState {
 /// descriptors if possible.
 ///
 /// Note that platform-specific behavior may change in the future.
+#[doc(alias = "copy_file_range", alias = "sendfile", alias = "splice")]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn copy<R: ?Sized, W: ?Sized>(reader: &mut R, writer: &mut W) -> Result<u64>
 where

library/core/src/arch.rs

@@ -68,7 +68,12 @@ pub macro global_asm("assembly template", $(operands,)* $(options($(option),*))?
 /// The precise behavior is not guaranteed, it depends on the architecture and operating system.
 /// Not all architectures guarantee that a breakpoint instruction interrupts execution in the absence
 /// of a debugger, and not all operating systems and execution environments guarantee that such an
-/// interrupt aborts the current process.
+/// interrupt aborts the current process. On operating systems where the behavior of the interrupt
+/// can be overwritten by the application (e.g. via a SIGTRAP signal handler), the application
+/// *should* make sure to still abort the process. However, code not fully in control of that
+/// application state (e.g. signal handlers) cannot always rely on that for soundness.
+/// If you do rely on this, such that your code's soundness requires applications to not continue
+/// from your breakpoints, please document that for your users.
 ///
 /// The precise instruction is guaranteed only on the following targets:
 /// - On x86 targets, this produces an `int3` instruction.

library/core/src/panic.rs

@@ -97,8 +97,9 @@ pub macro unreachable_2021 {
 /// Invokes a closure, aborting if the closure unwinds.
 ///
 /// When compiled with aborting panics, this function is effectively a no-op.
-/// With unwinding panics, an unwind results in another call into the panic
-/// hook followed by a process abort.
+/// With unwinding panics, an unwind that would leave the closure results in another call into the
+/// panic handler / panic hook followed by a process abort. (Locals in the closure get dropped as
+/// usual.) Unwinds that get caught inside the closure still behave as normal.
 ///
 /// # Notes
 ///
@@ -114,7 +115,7 @@ pub macro unreachable_2021 {
 /// to prevent unwinds. However, note that `extern "C" fn` will automatically
 /// convert unwinds to aborts, so using this function isn't necessary for FFI.
 #[unstable(feature = "abort_unwind", issue = "130338")]
-#[rustc_nounwind]
+#[rustc_nounwind] // this attribute does all the actual work here
 pub fn abort_on_unwind<F: FnOnce() -> R, R>(f: F) -> R {
     f()
 }

library/std/src/fs.rs

@@ -3039,7 +3039,7 @@ pub fn remove_file<P: AsRef<Path>>(path: P) -> io::Result<()> {
 ///     Ok(())
 /// }
 /// ```
-#[doc(alias = "stat")]
+#[doc(alias = "stat", alias = "GetFileAttributes", alias = "GetFileAttributesEx")]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[cfg_attr(not(test), rustc_diagnostic_item = "fs_metadata")]
 pub fn metadata<P: AsRef<Path>>(path: P) -> io::Result<Metadata> {
@@ -3080,7 +3080,7 @@ pub fn metadata<P: AsRef<Path>>(path: P) -> io::Result<Metadata> {
 ///     Ok(())
 /// }
 /// ```
-#[doc(alias = "lstat")]
+#[doc(alias = "lstat", alias = "GetFileAttributes", alias = "GetFileAttributesEx")]
 #[stable(feature = "symlink_metadata", since = "1.1.0")]
 #[cfg_attr(not(test), rustc_diagnostic_item = "fs_symlink_metadata")]
 pub fn symlink_metadata<P: AsRef<Path>>(path: P) -> io::Result<Metadata> {
@@ -3262,6 +3262,7 @@ pub fn rename_noreplace<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::R
 /// }
 /// ```
 #[doc(alias = "cp")]
+#[doc(alias = "copy_file_range")]
 #[doc(alias = "CopyFile", alias = "CopyFileEx")]
 #[doc(alias = "fclonefileat", alias = "fcopyfile")]
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -3511,6 +3512,7 @@ pub fn create_dir<P: AsRef<Path>>(path: P) -> io::Result<()> {
 ///     Ok(())
 /// }
 /// ```
+#[doc(alias = "mkdir", alias = "CreateDirectory")]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[cfg_attr(not(test), rustc_diagnostic_item = "fs_create_dir_all")]
 pub fn create_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> {
@@ -3626,6 +3628,7 @@ pub fn remove_dir<P: AsRef<Path>>(path: P) -> io::Result<()> {
 ///     Ok(())
 /// }
 /// ```
+#[doc(alias = "rm")]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[cfg_attr(not(test), rustc_diagnostic_item = "fs_remove_dir_all")]
 pub fn remove_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> {

library/std/src/os/windows/fs.rs

@@ -908,6 +908,7 @@ impl FileTimesExt for fs::FileTimes {
 /// the process as an administrator.
 ///
 /// [symlink-security]: https://docs.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/create-symbolic-links
+#[doc(alias = "CreateSymbolicLink", alias = "CreateSymbolicLinkW")]
 #[stable(feature = "symlink", since = "1.1.0")]
 #[cfg_attr(not(test), rustc_diagnostic_item = "fs_symlink_file")]
 pub fn symlink_file<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) -> io::Result<()> {
@@ -949,6 +950,7 @@ pub fn symlink_file<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) -> io:
 /// the process as an administrator.
 ///
 /// [symlink-security]: https://docs.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/create-symbolic-links
+#[doc(alias = "CreateSymbolicLink", alias = "CreateSymbolicLinkW")]
 #[stable(feature = "symlink", since = "1.1.0")]
 #[cfg_attr(not(test), rustc_diagnostic_item = "fs_symlink_dir")]
 pub fn symlink_dir<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) -> io::Result<()> {

library/stdarch/.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
     name: Check Style
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
       - name: Install Rust
         run: rustup update nightly --no-self-update && rustup default nightly
       - run: ci/style.sh
@@ -18,7 +18,7 @@ jobs:
     needs: [ style ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
       - name: Install Rust
         run: rustup update nightly --no-self-update && rustup default nightly
       - run: ci/dox.sh
@@ -30,7 +30,7 @@ jobs:
     needs: [ style ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
       - name: Install Rust
         run: rustup update nightly --no-self-update && rustup default nightly
       - run: cargo test --manifest-path crates/stdarch-verify/Cargo.toml
@@ -218,7 +218,7 @@ jobs:
         #   build_std: true
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
       - name: Install Rust
         run: |
           rustup update nightly --no-self-update
@@ -298,7 +298,7 @@ jobs:
           - target: armv7-unknown-linux-gnueabihf
             cc: gcc
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
       - name: Install Rust
         run: |
           rustup update nightly --no-self-update
@@ -326,7 +326,7 @@ jobs:
     env:
       STDARCH_GEN_MODE: check
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
       - name: Install Rust
         run: rustup update nightly && rustup default nightly && rustup component add rustfmt
       - name: Check arm spec
@@ -352,7 +352,7 @@ jobs:
     name: Run some tests with miri
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
       - name: Install Rust
         run: rustup update nightly && rustup default nightly && rustup component add miri
       - name: Run miri tests

library/stdarch/.github/workflows/rustc-pull.yml

@@ -10,6 +10,7 @@ on:
 jobs:
   pull:
     if: github.repository == 'rust-lang/stdarch'
+    # zizmor: ignore[unpinned-uses] We explicitly want to track the main branch.
     uses: rust-lang/josh-sync/.github/workflows/rustc-pull.yml@main
     with:
       github-app-id: ${{ vars.APP_CLIENT_ID }}