Skip to content

Commit 0585bdf

Browse files
author
The rustc-josh-sync Cronjob Bot
committed
Merge ref '21a19c297d4f' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 21a19c2 Filtered ref: 9a5c1fb93028e1a29a7598ce782efb0c5d7be534 This merge was created using https://github.com/rust-lang/josh-sync.
2 parents af10cb7 + 21a19c2 commit 0585bdf

File tree

3,124 files changed

+51967
-37250
lines changed

Some content is hidden

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

3,124 files changed

+51967
-37250
lines changed

.github/ISSUE_TEMPLATE/documentation.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Documentation problem
2-
description: Create a report for a documentation problem.
2+
description: Report an issue with documentation content.
33
labels: ["A-docs"]
44
body:
55
- type: markdown
@@ -19,20 +19,20 @@ body:
1919
- [The Rustonomicon](https://github.com/rust-lang/nomicon/issues)
2020
- [The Embedded Book](https://github.com/rust-embedded/book/issues)
2121
22-
All other documentation issues should be filed here.
22+
Or, if you find an issue related to rustdoc (e.g. doctest, rustdoc UI), please use the rustdoc issue template instead.
2323
24-
Or, if you find an issue related to rustdoc (e.g. doctest, rustdoc UI), please use the bug report or blank issue template instead.
24+
All other documentation issues should be filed here.
2525
2626
- type: textarea
2727
id: location
2828
attributes:
29-
label: Location
29+
label: Location (URL)
3030
validations:
31-
required: true
31+
required: true
3232

3333
- type: textarea
3434
id: summary
3535
attributes:
3636
label: Summary
3737
validations:
38-
required: true
38+
required: true

.github/workflows/ci.yml

Lines changed: 8 additions & 4 deletions
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.
@@ -152,9 +159,6 @@ jobs:
152159
- name: show the current environment
153160
run: src/ci/scripts/dump-environment.sh
154161

155-
- name: install rust
156-
run: src/ci/scripts/install-rust.sh
157-
158162
- name: install awscli
159163
run: src/ci/scripts/install-awscli.sh
160164

.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-07-13
28+
branch = rustc/21.1-2025-08-01
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)