Merge branch 'master' into unify_box_rc

Author: TimDiekmann

.gitattributes

@@ -16,3 +16,11 @@ config.toml.example linguist-language=TOML
 *.ico binary
 *.woff binary
 *.woff2 binary
+
+# Needed as part of converting rustfmt to a subtree, can hopefully be removed later.
+src/tools/rustfmt/tests/source/issue-3494/crlf.rs -text
+src/tools/rustfmt/tests/source/comment_crlf_newline.rs -text
+src/tools/rustfmt/tests/source/configs/enum_discrim_align_threshold/40.rs -text
+src/tools/rustfmt/tests/target/issue-3494/crlf.rs -text
+src/tools/rustfmt/tests/target/comment_crlf_newline.rs -text
+src/tools/rustfmt/tests/target/configs/enum_discrim_align_threshold/40.rs -text

.github/ISSUE_TEMPLATE/regression.md

@@ -1,7 +1,7 @@
 ---
 name: Regression
 about: Report something that unexpectedly changed between Rust versions.
-labels: C-bug regression-untriaged
+labels: C-bug, regression-untriaged
 ---
 <!--
 Thank you for filing a regression report! 🐛 A regression is something that changed between versions of Rust but was not supposed to.

.github/workflows/ci.yml

@@ -72,6 +72,9 @@ jobs:
       - name: decide whether to skip this job
         run: src/ci/scripts/should-skip-this.sh
         if: success() && !env.SKIP_JOB
+      - name: ensure the channel matches the target branch
+        run: src/ci/scripts/verify-channel.sh
+        if: success() && !env.SKIP_JOB
       - name: configure GitHub Actions to kill the build when outdated
         uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
         with:
@@ -434,6 +437,9 @@ jobs:
       - name: decide whether to skip this job
         run: src/ci/scripts/should-skip-this.sh
         if: success() && !env.SKIP_JOB
+      - name: ensure the channel matches the target branch
+        run: src/ci/scripts/verify-channel.sh
+        if: success() && !env.SKIP_JOB
       - name: configure GitHub Actions to kill the build when outdated
         uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
         with:
@@ -541,6 +547,9 @@ jobs:
       - name: decide whether to skip this job
         run: src/ci/scripts/should-skip-this.sh
         if: success() && !env.SKIP_JOB
+      - name: ensure the channel matches the target branch
+        run: src/ci/scripts/verify-channel.sh
+        if: success() && !env.SKIP_JOB
       - name: configure GitHub Actions to kill the build when outdated
         uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
         with:

.gitmodules

@@ -16,9 +16,6 @@
 [submodule "src/tools/rls"]
 	path = src/tools/rls
 	url = https://github.com/rust-lang/rls.git
-[submodule "src/tools/rustfmt"]
-	path = src/tools/rustfmt
-	url = https://github.com/rust-lang/rustfmt.git
 [submodule "src/tools/miri"]
 	path = src/tools/miri
 	url = https://github.com/rust-lang/miri.git

.mailmap

@@ -43,7 +43,8 @@ Brian Anderson <[email protected]> <[email protected]>
 Brian Anderson <[email protected]> <[email protected]>
 Brian Dawn <[email protected]>
 Brian Leibig <[email protected]> Brian Leibig <[email protected]>
-Camelid <[email protected]> <[email protected]>
+Noah Lev <[email protected]>
+Noah Lev <[email protected]> <[email protected]>
 Carl-Anton Ingmarsson <[email protected]> <[email protected]>
 Carol (Nichols || Goulding) <[email protected]> <[email protected]>
 Carol (Nichols || Goulding) <[email protected]> <[email protected]>