Merge branch 'rust-lang:master' into master

Author: Psalmuel01

.github/workflows/ci.yml

@@ -156,7 +156,7 @@ jobs:
         run: src/ci/scripts/verify-stable-version-number.sh
         if: success() && !env.SKIP_JOB
       - name: run the build
-        run: src/ci/scripts/run-build-from-ci.sh
+        run: src/ci/scripts/run-build-from-ci.sh 2>&1
         env:
           AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -566,7 +566,7 @@ jobs:
         run: src/ci/scripts/verify-stable-version-number.sh
         if: success() && !env.SKIP_JOB
       - name: run the build
-        run: src/ci/scripts/run-build-from-ci.sh
+        run: src/ci/scripts/run-build-from-ci.sh 2>&1
         env:
           AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -705,7 +705,7 @@ jobs:
         run: src/ci/scripts/verify-stable-version-number.sh
         if: success() && !env.SKIP_JOB
       - name: run the build
-        run: src/ci/scripts/run-build-from-ci.sh
+        run: src/ci/scripts/run-build-from-ci.sh 2>&1
         env:
           AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"

.mailmap

@@ -307,6 +307,8 @@ Joseph T. Lyons <[email protected]> <[email protected]>
 Josh Cotton <[email protected]>
 Josh Driver <[email protected]>
 Josh Holmer <[email protected]>
+Josh Stone <[email protected]> <[email protected]>
+Josh Stone <[email protected]> <[email protected]>
 Julian Knodt <[email protected]>
 jumbatm <[email protected]> <[email protected]>
 Junyoung Cho <[email protected]>
@@ -474,7 +476,8 @@ Philipp Matthias Schäfer <[email protected]>
 phosphorus <[email protected]>
 Pierre Krieger <[email protected]>
 pierwill <[email protected]> <[email protected]>
-Pietro Albini <[email protected]> <[email protected]> <[email protected]>
+Pietro Albini <[email protected]> <[email protected]>
+Pietro Albini <[email protected]> <[email protected]>
 Pradyumna Rahul <[email protected]>
 Przemysław Wesołek <[email protected]> Przemek Wesołek <[email protected]>
 r00ster <[email protected]>
@@ -543,6 +546,7 @@ Takashi Idobe <[email protected]>
 Takayuki Maeda <[email protected]>
 Tamir Duberstein <[email protected]> Tamir Duberstein <[email protected]>
 Tatsuyuki Ishi <[email protected]>
+Tau Gärtli <[email protected]> <[email protected]>
 Tero Hänninen <[email protected]> Tero Hänninen <[email protected]>
 The8472 <[email protected]>
 Theo Belaire <[email protected]> Theo Belaire <[email protected]>