Merge ref '383b9c447b61' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 383b9c4
Filtered ref: 14b7b0bbd1e38402fca29ef84e5f75ee9d8cb1a9

This merge was created using https://github.com/rust-lang/josh-sync.

Author: The rustc-josh-sync Cronjob Bot

.github/workflows/ci.yml

@@ -159,9 +159,6 @@ jobs:
       - name: show the current environment
         run: src/ci/scripts/dump-environment.sh
 
-      - name: install rust
-        run: src/ci/scripts/install-rust.sh
-
       - name: install awscli
         run: src/ci/scripts/install-awscli.sh
 

.mailmap

@@ -597,6 +597,7 @@ Sam Radhakrishnan <[email protected]>
 Samuel Tardieu <[email protected]>
 Santiago Pastorino <[email protected]>
 Santiago Pastorino <[email protected]> <[email protected]>
+Sasha Pourcelot <[email protected]> Sasha <[email protected]>
 Scott McMurray <[email protected]>
 Scott McMurray <[email protected]> <[email protected]>
 Scott Olson <[email protected]> Scott Olson <[email protected]>