Skip to content

Commit a1bc030

Browse files
committed
Merge from rustc
2 parents 24138f0 + de64462 commit a1bc030

File tree

1,044 files changed

+18514
-9574
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,044 files changed

+18514
-9574
lines changed

.github/pull_request_template.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!--
2+
If this PR is related to an unstable feature or an otherwise tracked effort,
3+
please link to the relevant tracking issue here. If you don't know of a related
4+
tracking issue or there are none, feel free to ignore this.
5+
6+
This PR will get automatically assigned to a reviewer. In case you would like
7+
a specific user to review your work, you can assign it to them by using
8+
9+
r​? <reviewer name>
10+
-->

.github/workflows/ci.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ jobs:
190190
env:
191191
AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
192192
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
193-
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
194193

195194
- name: create github artifacts
196195
run: src/ci/scripts/create-doc-artifacts.sh
@@ -241,3 +240,5 @@ jobs:
241240
if: needs.calculate_matrix.outputs.run_type == 'auto'
242241
env:
243242
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
243+
TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues
244+
TOOLSTATE_PUBLISH: 1

.gitmodules

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
[submodule "src/llvm-project"]
3434
path = src/llvm-project
3535
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/18.0-2024-02-13
36+
branch = rustc/18.1-2024-05-19
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book
@@ -43,3 +43,7 @@
4343
path = library/backtrace
4444
url = https://github.com/rust-lang/backtrace-rs.git
4545
shallow = true
46+
[submodule "src/tools/rustc-perf"]
47+
path = src/tools/rustc-perf
48+
url = https://github.com/rust-lang/rustc-perf.git
49+
shallow = true

0 commit comments

Comments
 (0)