Skip to content

Commit 949a385

Browse files
committed
Auto merge of rust-lang#2830 - oli-obk:rustup, r=oli-obk
Rustup
2 parents 7315b6d + 663664b commit 949a385

File tree

1,824 files changed

+16406
-9009
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,824 files changed

+16406
-9009
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
pr:
3535
permissions:
3636
actions: write
37-
name: PR
37+
name: "PR - ${{ matrix.name }}"
3838
env:
3939
CI_JOB_NAME: "${{ matrix.name }}"
4040
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
@@ -159,7 +159,7 @@ jobs:
159159
auto:
160160
permissions:
161161
actions: write
162-
name: auto
162+
name: "auto - ${{ matrix.name }}"
163163
env:
164164
CI_JOB_NAME: "${{ matrix.name }}"
165165
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
@@ -578,7 +578,7 @@ jobs:
578578
try:
579579
permissions:
580580
actions: write
581-
name: try
581+
name: "try - ${{ matrix.name }}"
582582
env:
583583
CI_JOB_NAME: "${{ matrix.name }}"
584584
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
[submodule "src/llvm-project"]
2626
path = src/llvm-project
2727
url = https://github.com/rust-lang/llvm-project.git
28-
branch = rustc/15.0-2022-12-07
28+
branch = rustc/16.0-2023-03-06
2929
[submodule "src/doc/embedded-book"]
3030
path = src/doc/embedded-book
3131
url = https://github.com/rust-embedded/book.git

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Carol Willing <carolcode@willingconsulting.com>
102102
Chandler Deng <chandde@microsoft.com>
103103
Charles Lew <crlf0710@gmail.com> CrLF0710 <crlf0710@gmail.com>
104104
Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccerami@gmail.com>
105+
Chris Denton <chris@chrisdenton.dev> Chris Denton <ChrisDenton@users.noreply.github.com>
105106
Chris Gregory <czipperz@gmail.com>
106107
Chris Pardy <chrispardy36@gmail.com>
107108
Chris Pressey <cpressey@gmail.com>
@@ -415,6 +416,7 @@ Nick Platt <platt.nicholas@gmail.com>
415416
Niclas Schwarzlose <15schnic@gmail.com>
416417
Nicolas Abram <abramlujan@gmail.com>
417418
Nicole Mazzuca <npmazzuca@gmail.com>
419+
Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> nils <48135649+Nilstrieb@users.noreply.github.com>
418420
Nif Ward <nif.ward@gmail.com>
419421
Nika Layzell <nika@thelayzells.com> <michael@thelayzells.com>
420422
NODA Kai <nodakai@gmail.com>

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ find a mentor! You can learn more about asking questions and getting help in the
3333
Did a compiler error message tell you to come here? If you want to create an ICE report,
3434
refer to [this section][contributing-bug-reports] and [open an issue][issue template].
3535

36-
[Contributing to Rust]: https://rustc-dev-guide.rust-lang.org/contributing.html#contributing-to-rust
3736
[rustc-dev-guide]: https://rustc-dev-guide.rust-lang.org/
3837
[std-dev-guide]: https://std-dev-guide.rust-lang.org/
3938
[contributing-bug-reports]: https://rustc-dev-guide.rust-lang.org/contributing.html#bug-reports

0 commit comments

Comments
 (0)