Skip to content

Commit 52af045

Browse files
committed
Auto merge of rust-lang#2789 - RalfJung:rustup, r=RalfJung
Rustup
2 parents 8deed11 + 1a2908b commit 52af045

File tree

1,117 files changed

+27798
-19494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,117 files changed

+27798
-19494
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
tidy: true
5555
os: ubuntu-20.04-xl
5656
env: {}
57-
- name: x86_64-gnu-llvm-13
57+
- name: x86_64-gnu-llvm-14
5858
tidy: false
5959
os: ubuntu-20.04-xl
6060
env: {}
@@ -300,11 +300,7 @@ jobs:
300300
env:
301301
RUST_BACKTRACE: 1
302302
os: ubuntu-20.04-xl
303-
- name: x86_64-gnu-llvm-13
304-
env:
305-
RUST_BACKTRACE: 1
306-
os: ubuntu-20.04-xl
307-
- name: x86_64-gnu-llvm-13-stage1
303+
- name: x86_64-gnu-llvm-14-stage1
308304
env:
309305
RUST_BACKTRACE: 1
310306
os: ubuntu-20.04-xl

.mailmap

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -419,18 +419,18 @@ Nixon Enraght-Moony <[email protected]>
419419
420420
421421
422-
423-
424-
425-
426-
427-
428-
429-
430-
431-
Oliver Scherer <[email protected]> <public.[email protected]>
432-
433-
Oliver Scherer <[email protected]>
422+
423+
424+
425+
426+
427+
428+
429+
430+
431+
432+
433+
Oliver Scherer <[email protected]>
434434
Ömer Sinan Ağacan <[email protected]>
435435
Ophir LOJKINE <[email protected]>
436436
Ožbolt Menegatti <[email protected]> gareins <[email protected]>

0 commit comments

Comments
 (0)