Skip to content

Commit ce0de76

Browse files
author
The rustc-josh-sync Cronjob Bot
committed
Merge ref 'fd2eb391d032' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: fd2eb39 Filtered ref: 1ea8d5f9c22f0930a0caa27637ef9232fead3c2b This merge was created using https://github.com/rust-lang/josh-sync.
2 parents 2faf5ed + fd2eb39 commit ce0de76

File tree

1,977 files changed

+36992
-21507
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,977 files changed

+36992
-21507
lines changed

.github/ISSUE_TEMPLATE/tracking_issue_future.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ it would be `T-libs-api`.
1414
Also check for any `A-` labels to add.
1515
-->
1616

17-
This is the **tracking issue** for the `YOUR_LINT_NAME_HERE` future-compatibility warning and other related errors. The goal of this page is describe why this change was made and how you can fix code that is affected by it. It also provides a place to ask questions or register a complaint if you feel the change should not be made. For more information on the policy around future-compatibility warnings, see our [breaking change policy guidelines][guidelines].
17+
This is the **tracking issue** for the `YOUR_LINT_NAME_HERE` future-compatibility warning and other related errors. The goal of this page is to describe why this change was made and how you can fix code that is affected by it. It also provides a place to ask questions or register a complaint if you feel the change should not be made. For more information on the policy around future-compatibility warnings, see our [breaking change policy guidelines][guidelines].
1818

1919
[guidelines]: https://rustc-dev-guide.rust-lang.org/bug-fix-procedure.html
2020

@@ -44,7 +44,7 @@ This is the **tracking issue** for the `YOUR_LINT_NAME_HERE` future-compatibilit
4444

4545
- [ ] Implement the lint
4646
- [ ] Raise lint level to deny
47-
- [ ] Make lint report in dependencies
47+
- [ ] Change the lint to report in dependencies
4848
- [ ] Switch to a hard error
4949

5050
### Implementation history

.github/workflows/ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@ jobs:
152152
- name: show the current environment
153153
run: src/ci/scripts/dump-environment.sh
154154

155+
- name: install rust
156+
run: src/ci/scripts/install-rust.sh
157+
155158
- name: install awscli
156159
run: src/ci/scripts/install-awscli.sh
157160

@@ -179,6 +182,11 @@ jobs:
179182
- name: install MinGW
180183
run: src/ci/scripts/install-mingw.sh
181184

185+
# Workaround for spurious ci failures after mingw install
186+
# see https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Spurious.20bors.20CI.20failures/near/528915775
187+
- name: ensure home dir exists
188+
run: mkdir -p ~
189+
182190
- name: install ninja
183191
run: src/ci/scripts/install-ninja.sh
184192

.github/workflows/dependencies.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ env:
1919
PR_TITLE: Weekly `cargo update`
2020
PR_MESSAGE: |
2121
Automation to keep dependencies in `Cargo.lock` current.
22+
r? dep-bumps
2223
2324
The following is the output from `cargo update`:
2425
COMMIT_MESSAGE: "cargo update \n\n"

.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/20.1-2025-02-13
28+
branch = rustc/20.1-2025-07-13
2929
shallow = true
3030
[submodule "src/doc/embedded-book"]
3131
path = src/doc/embedded-book

0 commit comments

Comments
 (0)