Skip to content

Commit 67cd427

Browse files
authored
Merge branch 'rust-lang:master' into ascii_char_is_ascii
2 parents 16b8f73 + 213d946 commit 67cd427

File tree

5,722 files changed

+112014
-75465
lines changed

Some content is hidden

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

5,722 files changed

+112014
-75465
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,21 @@ jobs:
117117
with:
118118
fetch-depth: 2
119119

120-
# Free up disk space on Linux by removing preinstalled components that
120+
# Free up disk space on Linux and Windows by removing preinstalled components that
121121
# we do not need. We do this to enable some of the less resource
122122
# intensive jobs to run on free runners, which however also have
123123
# less disk space.
124124
- name: free up disk space
125125
run: src/ci/scripts/free-disk-space.sh
126126
if: matrix.free_disk
127127

128+
# If we don't need to free up disk space then just report how much space we have
129+
- name: print disk usage
130+
run: |
131+
echo "disk usage:"
132+
df -h
133+
if: matrix.free_disk == false
134+
128135
# Rust Log Analyzer can't currently detect the PR number of a GitHub
129136
# Actions build on its own, so a hint in the log message is needed to
130137
# point it in the right direction.

.github/workflows/spellcheck.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ __pycache__/
8585

8686
## Node
8787
node_modules
88-
package-lock.json
89-
package.json
9088
/src/doc/rustc-dev-guide/mermaid.min.js
9189

9290
## Rustdoc GUI tests

.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

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,7 @@ Sam Radhakrishnan <[email protected]>
597597
Samuel Tardieu <[email protected]>
598598
Santiago Pastorino <[email protected]>
599599
Santiago Pastorino <[email protected]> <[email protected]>
600+
Sasha Pourcelot <[email protected]> Sasha <[email protected]>
600601
Scott McMurray <[email protected]>
601602
602603
Scott Olson <[email protected]> Scott Olson <[email protected]>

0 commit comments

Comments
 (0)