Sync-New

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: rustfoundation
-custom: ["rust-lang.org/funding"]
+custom: ["https://rust-lang.org/funding"]

.github/ISSUE_TEMPLATE/library_tracking_issue.md

@@ -2,7 +2,7 @@
 name: Library Tracking Issue
 about: A tracking issue for an unstable library feature.
 title: Tracking Issue for XXX
-labels: C-tracking-issue, T-libs-api, S-tracking-unimplemented
+labels: C-tracking-issue, T-libs, S-tracking-unimplemented
 ---
 <!--
 Thank you for creating a tracking issue!

.github/ISSUE_TEMPLATE/tracking_issue_future.md

@@ -10,7 +10,7 @@ are for lints that implement a future-incompatible warning.
 
 Remember to add team labels to the tracking issue.
 For something that affects the language, this would be `T-lang`, and for libs
-it would be `T-libs-api`.
+it would be `T-libs`.
 Also check for any `A-` labels to add.
 -->
 

.github/pull_request_template.md

@@ -1,15 +1,11 @@
 <!-- homu-ignore:start -->
-
-- [ ] I did not use an LLM to create a change in this PR.
-- [ ] I used an LLM to create a change in this PR, and I have explained below how it was used.
-
 <!--
 Please read our [LLM policy] before opening a PR,
-and check one of the boxes above to indicate whether you've used an LLM.
-If you do not check a box, a reviewer may ask you whether an LLM was involved.
+If you used an LLM to generate any part of this PR, including the PR description, please disclose that according to our [guidelines][disclosure guidelines].
 LLM contributions are not banned, but are held to a higher standard of review and correctness.
 
 [LLM policy]: https://forge.rust-lang.org/policies/llm-usage.html
+[disclosure guidelines]: https://rustc-dev-guide.rust-lang.org/llm-guidance/writing.html#disclosure-guidelines
 
 If this PR is related to an unstable feature or an otherwise tracked effort,
 please link to the relevant tracking issue here. If you don't know of a related
@@ -19,5 +15,9 @@ This PR will get automatically assigned to a reviewer. In case you would like
 a specific user to review your work, you can assign it to them by using
 
     r? <reviewer name>
+
+When merged, your PR's description becomes part of the commit message of a merge commit.
+If you do not want certain parts of it (such as your LLM disclosure) to show up in the permanent git history,
+surround them with a pair of HTML comments containing `homu-ignore:start` and `homu-ignore:end`.
 -->
 <!-- homu-ignore:end -->

.github/renovate.json5

@@ -48,8 +48,8 @@
       "groupName": "Cargo lock file maintenance",
       "commitMessageAction": "Compiler and tools lock file update",
       // Renovate merges all matching rules, so the lockfiles rules below
-      // also inherits this note and asks Triagebot for a dep-bumps reviewer.
-      "prBodyNotes": ["r? dep-bumps"]
+      // also inherits these notes and asks Triagebot for a dep-bumps reviewer.
+      "prBodyNotes": ["r? dep-bumps", "⚠️ Supply chain security safety: wait 3 days until the last commit to this PR before running `bors try` or `bors r+`"]
     },
     {
       // Update library/Cargo.lock in a dedicated PR.
@@ -69,11 +69,12 @@
       "enabled": false
     },
     {
-      // Update yarn.lock in a dedicated PR.
-      "matchManagers": ["npm"],
+      // Do not update npm/yarn lockfile, we only use it for internal tests.
+      "matchManagers": [
+        "npm"
+      ],
       "matchUpdateTypes": ["lockFileMaintenance"],
-      "groupName": "Yarn lock file maintenance",
-      "commitMessageAction": "Yarn lock file update"
+      "enabled": false,
     }
   ],
   "ignorePaths": [

.github/workflows/ci.yml

@@ -14,7 +14,6 @@ on:
       - automation/bors/auto
       - automation/bors/try
       - automation/bors/try-perf
-      - try-perf
   pull_request:
     branches:
       - "**"
@@ -33,9 +32,9 @@ defaults:
 concurrency:
   # For a given workflow, if we push to the same branch, cancel all previous builds on that branch.
   # We add an exception for try builds (automation/bors/try branch) and unrolled rollup builds
-  # (try-perf), which are all triggered on the same branch, but which should be able to run
-  # concurrently.
-  group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try-perf' || github.ref == 'refs/heads/automation/bors/try') && github.sha) || github.ref }}
+  # (automation/bors/try-perf), which are all triggered on the same branch, but which should be able
+  # to run concurrently.
+  group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/automation/bors/try-perf' || github.ref == 'refs/heads/automation/bors/try') && github.sha) || github.ref }}
   cancel-in-progress: true
 env:
   TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
@@ -60,13 +59,13 @@ jobs:
         if: ${{ github.ref == 'refs/heads/automation/bors/auto' }}
         run: |
           cd src/ci/citool
-          CARGO_INCREMENTAL=0 cargo test
+          CARGO_INCREMENTAL=0 cargo test --locked
       - name: Calculate the CI job matrix
         env:
           COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
         run: |
           cd src/ci/citool
-          CARGO_INCREMENTAL=0 cargo run calculate-job-matrix >> $GITHUB_OUTPUT
+          CARGO_INCREMENTAL=0 cargo run --locked calculate-job-matrix >> $GITHUB_OUTPUT
         id: jobs
   job:
     name: ${{ matrix.full_name }}
@@ -80,7 +79,7 @@ jobs:
     # access the environment.
     #
     # We only enable the environment for the rust-lang/rust repository, so that CI works on forks.
-    environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/automation/bors/try-perf' || github.ref == 'refs/heads/automation/bors/auto')) && 'bors') || '' }}
+    environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/automation/bors/try-perf' || github.ref == 'refs/heads/automation/bors/auto')) && 'bors') || '' }}
     env:
       CI_JOB_NAME: ${{ matrix.name }}
       CI_JOB_DOC_URL: ${{ matrix.doc_url }}
@@ -223,7 +222,7 @@ jobs:
       - name: build citool
         run: |
           cd src/ci/citool
-          CARGO_INCREMENTAL=0 CARGO_TARGET_DIR=../../../build/citool cargo build
+          CARGO_INCREMENTAL=0 CARGO_TARGET_DIR=../../../build/citool cargo build --locked
 
       - name: run the build
         run: |

.github/workflows/post-merge.yml

@@ -46,7 +46,7 @@ jobs:
           printf "This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.\n" >> output.log
           printf "</details>\n\n" >> output.log
 
-          cargo run --release post-merge-report ${PARENT_COMMIT} ${{ github.sha }} >> output.log
+          cargo run --locked --release post-merge-report ${PARENT_COMMIT} ${{ github.sha }} >> output.log
 
           cat output.log
 

.mailmap

@@ -505,6 +505,11 @@ Nathaniel Hamovitz <18648574+nhamovitz@users.noreply.github.com>
 Nathaniel Herman <nherman@post.harvard.edu> Nathaniel Herman <nherman@college.harvard.edu>
 Neil Pankey <npankey@gmail.com> <neil@wire.im>
 Ngo Iok Ui (Wu Yu Wei) <wusyong9104@gmail.com>
+Nia Deckers <me@nia.gay>
+Nia Deckers <me@nia.gay> <nia-e@haecceity.cc>
+Nia Deckers <me@nia.gay> <nia@zed.dev>
+Nia Deckers <me@nia.gay> <nia@hexcat.nl>
+Nia Deckers <me@nia.gay> <a5b6@riseup.net>
 Nicholas Baron <nicholas.baron.ten@gmail.com>
 Nicholas Bishop <nbishop@nbishop.net> <nicholasbishop@gmail.com>
 Nicholas Bishop <nbishop@nbishop.net> <nicholasbishop@google.com>
@@ -687,8 +692,9 @@ Tomas Koutsky <tomas@stepnivlk.net>
 Tomasz Miąsko <tomasz.miasko@gmail.com>
 Torsten Weber <TorstenWeber12@gmail.com>
 Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com>
-Trevor Gross <tmgross@umich.edu> <t.gross35@gmail.com>
-Trevor Gross <tmgross@umich.edu> <tgross@intrepidcs.com>
+Trevor Gross <tg@trevorgross.com> <t.gross35@gmail.com>
+Trevor Gross <tg@trevorgross.com> <tgross@intrepidcs.com>
+Trevor Gross <tg@trevorgross.com> <tmgross@umich.edu>
 Trevor Spiteri <tspiteri@ieee.org> <trevor.spiteri@um.edu.mt>
 Tshepang Mbambo <hopsi@tuta.io> <tshepang@gmail.com>
 Ty Overby <ty@pre-alpha.com>
@@ -710,6 +716,8 @@ Weihang Lo <me@weihanglo.tw>
 Weihang Lo <me@weihanglo.tw> <weihanglo@users.noreply.github.com>
 Wesley Wiser <wwiser@gmail.com> <wesleywiser@microsoft.com>
 whitequark <whitequark@whitequark.org>
+Wilfred Hughes <me@wilfred.me.uk>
+Wilfred Hughes <me@wilfred.me.uk> <wilfred@meta.com>
 Will Crichton <crichton.will@gmail.com> <wcrichto@stanford.edu>
 Will Crichton <crichton.will@gmail.com> <wcrichto@cs.stanford.edu>
 William Ting <io@williamting.com> <william.h.ting@gmail.com>
@@ -735,3 +743,4 @@ Zack Corr <zack@z0w0.me> <zackcorr95@gmail.com>
 Zack Slayton <zack.slayton@gmail.com>
 Zbigniew Siciarz <zbigniew@siciarz.net> Zbigniew Siciarz <antyqjon@gmail.com>
 y21 <30553356+y21@users.noreply.github.com>
+朝倉水希 <mizuk1@mzk1.dev> <asakuramizu111@gmail.com>