Merge branch 'rust-lang:master' into master

Author: YingkaiLi-VM

.github/ISSUE_TEMPLATE/rustdoc.md

@@ -0,0 +1,54 @@
+---
+name: Problem with rustdoc
+about: Report an issue with how docs get generated.
+labels: C-bug, T-rustdoc
+---
+<!--
+Thank you for filing a rustdoc issue! Rustdoc is the tool that handles the generation of docs.  It is usually invoked via `cargo doc`, but can also be used directly.
+
+If you have an issue with the actual content of the docs, use the "Documentation problem" template instead.
+-->
+
+# Code
+<!-- problematic snippet and/or link to repo and/or full path of standard library function -->
+
+```rust
+<code>
+```
+
+# Reproduction Steps
+<!--
+* command(s) to run, if any
+* permalink to hosted documentation, if any
+* search query, if any
+-->
+
+# Expected Outcome
+<!--
+What did you want to happen?
+
+For GUI issues, feel free to provide a mockup image of what you want it to look like.
+
+For diagnostics, please provide a mockup of the desired output in a code block.
+-->
+
+# Actual Output
+<!--
+* rustdoc console output
+* browser screenshot of generated html
+* rustdoc json (prettify by running through `jq` or running thorugh an online formatter)
+-->
+```console
+<code>
+```
+
+
+# Version
+<!--
+Available via `rustdoc --version` or under the "Help" menu.
+
+If the issue involves opening the documentation in a browser, please also provide the name and version of the browser used.
+-->
+
+# Additional Details
+<!-- Anything else you think is relevant -->

.github/workflows/ci.yml

@@ -11,10 +11,6 @@ name: CI
 on:
   push:
     branches:
-      # CI on master only serves for caching citool builds for the `calculate_matrix` job.
-      # In order to use GHA cache on PR CI (and auto/try) jobs, we need to write to it
-      # from the default branch.
-      - master
       - auto
       - try
       - try-perf
@@ -57,19 +53,18 @@ jobs:
     steps:
       - name: Checkout the source code
         uses: actions/checkout@v4
-      # Cache citool to make its build faster, as it's in the critical path.
-      # The rust-cache doesn't bleed into the main `job`, so it should not affect any other
-      # Rust compilation.
-      - name: Cache citool
-        uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-        with:
-          workspaces: src/ci/citool
+      - name: Test citool
+        # Only test citool on the auto branch, to reduce latency of the calculate matrix job
+        # on PR/try builds.
+        if: ${{ github.ref == 'refs/heads/auto' }}
+        run: |
+          cd src/ci/citool
+          CARGO_INCREMENTAL=0 cargo test
       - name: Calculate the CI job matrix
         env:
           COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
         run: |
           cd src/ci/citool
-          CARGO_INCREMENTAL=0 cargo test
           CARGO_INCREMENTAL=0 cargo run calculate-job-matrix >> $GITHUB_OUTPUT
         id: jobs
   job:

.gitmodules

@@ -18,10 +18,6 @@
 	path = src/doc/rust-by-example
 	url = https://github.com/rust-lang/rust-by-example.git
 	shallow = true
-[submodule "library/stdarch"]
-	path = library/stdarch
-	url = https://github.com/rust-lang/stdarch.git
-	shallow = true
 [submodule "src/doc/edition-guide"]
 	path = src/doc/edition-guide
 	url = https://github.com/rust-lang/edition-guide.git

.mailmap

@@ -34,10 +34,13 @@ Alona Enraght-Moony <[email protected]> <[email protected]>
 Alona Enraght-Moony <[email protected]> <[email protected]>
 Amanda Stjerna <[email protected]> <[email protected]>
 Amanda Stjerna <[email protected]> <[email protected]>
+Amanieu d'Antras <[email protected]> <[email protected]>
 Amos Onn <[email protected]>
 Ana-Maria Mihalache <[email protected]>
 Anatoly Ikorsky <[email protected]>
 Andre Bogus <[email protected]>
+Andre Bogus <[email protected]> <[email protected]>
+Andre Bogus <[email protected]> <[email protected]>
 Andrea Ciliberti <[email protected]>
 Andreas Gal <[email protected]> <[email protected]>
 Andreas Jonson <[email protected]>
@@ -116,6 +119,7 @@ Carol Willing <[email protected]>
 Chandler Deng <[email protected]>
 Charles Lew <[email protected]> CrLF0710 <[email protected]>
 Chris C Cerami <[email protected]> Chris C Cerami <[email protected]>
+Chris Denton <[email protected]> <[email protected]>
 Chris Denton <[email protected]> Chris Denton <[email protected]>
 Chris Gregory <[email protected]>
 Chris Pardy <[email protected]>
@@ -158,8 +162,10 @@ David Carlier <[email protected]>
 David Klein <[email protected]>
 David Manescu <[email protected]> <[email protected]>
 David Ross <[email protected]>
-David Wood <[email protected]> <[email protected]>
+David Wood <[email protected]> <[email protected]>
+David Wood <[email protected]> <[email protected]>
 David Wood <[email protected]> <[email protected]>
+David Wood <[email protected]> <[email protected]>
 Deadbeef <[email protected]>
 Deadbeef <[email protected]> <[email protected]>
 dependabot[bot] <dependabot[bot]@users.noreply.github.com> <27856297+dependabot-preview[bot]@users.noreply.github.com>
@@ -403,6 +409,8 @@ Urgau <[email protected]> <[email protected]>
 Lucy <[email protected]>
 Lukas H. <[email protected]>
 Lukas Lueg <[email protected]>
+Lukas Wirth <[email protected]> <[email protected]>
+Lukas Wirth <[email protected]> <[email protected]>
 Luke Metz <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
@@ -493,6 +501,7 @@ Nicolas Abram <[email protected]>
 Nicole Mazzuca <[email protected]>
 Niko Matsakis <[email protected]>
 Niko Matsakis <[email protected]> <[email protected]>
+Niko Matsakis <[email protected]> <[email protected]>
 Noratrieb <[email protected]>
 Noratrieb <[email protected]> <[email protected]>
 Noratrieb <[email protected]> <[email protected]>
@@ -681,6 +690,7 @@ Xinye Tao <[email protected]>
 Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
 Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
 York Xiang <[email protected]>
+Yotam Ofek <[email protected]> <[email protected]>
 Youngsoo Son <[email protected]> <[email protected]>
 Youngsuk Kim <[email protected]>
 Yuki Okushi <[email protected]>
@@ -691,3 +701,4 @@ Zach Pomerantz <[email protected]>
 Zack Corr <[email protected]> <[email protected]>
 Zack Slayton <[email protected]>
 Zbigniew Siciarz <[email protected]> Zbigniew Siciarz <[email protected]>
+y21 <[email protected]>