Auto merge of rust-lang#2789 - RalfJung:rustup, r=RalfJung

Rustup
RalfJung · Feb 15, 2023 · 52af045 · 52af045
2 parents 8deed11 + 1a2908b
commit 52af045
Show file tree

Hide file tree

Showing 1,117 changed files with 27,798 additions and 19,494 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
             tidy: true
             os: ubuntu-20.04-xl
             env: {}
-          - name: x86_64-gnu-llvm-13
+          - name: x86_64-gnu-llvm-14
             tidy: false
             os: ubuntu-20.04-xl
             env: {}
@@ -300,11 +300,7 @@ jobs:
             env:
               RUST_BACKTRACE: 1
             os: ubuntu-20.04-xl
-          - name: x86_64-gnu-llvm-13
-            env:
-              RUST_BACKTRACE: 1
-            os: ubuntu-20.04-xl
-          - name: x86_64-gnu-llvm-13-stage1
+          - name: x86_64-gnu-llvm-14-stage1
             env:
               RUST_BACKTRACE: 1
             os: ubuntu-20.04-xl

diff --git a/.mailmap b/.mailmap
@@ -419,18 +419,18 @@ Nixon Enraght-Moony <[email protected]>
 NODA Kai <[email protected]>
 oliver <[email protected]>
 Oliver Middleton <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <public.[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]>
 Ömer Sinan Ağacan <[email protected]>
 Ophir LOJKINE <[email protected]>
 Ožbolt Menegatti <[email protected]> gareins <[email protected]>