Skip to content

Commit 18ce05f

Browse files
authored
Merge branch 'master' into duration-from-nanos-u128
2 parents b7e27a4 + a413f77 commit 18ce05f

File tree

10,971 files changed

+1050710
-182363
lines changed

Some content is hidden

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

10,971 files changed

+1050710
-182363
lines changed

.github/ISSUE_TEMPLATE/rustdoc.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
name: Problem with rustdoc
3+
about: Report an issue with how docs get generated.
4+
labels: C-bug, T-rustdoc
5+
---
6+
<!--
7+
Thank you for filing a rustdoc issue! Rustdoc is the tool that handles the generation of docs. It is usually invoked via `cargo doc`, but can also be used directly.
8+
9+
If you have an issue with the actual content of the docs, use the "Documentation problem" template instead.
10+
-->
11+
12+
# Code
13+
<!-- problematic snippet and/or link to repo and/or full path of standard library function -->
14+
15+
```rust
16+
<code>
17+
```
18+
19+
# Reproduction Steps
20+
<!--
21+
* command(s) to run, if any
22+
* permalink to hosted documentation, if any
23+
* search query, if any
24+
-->
25+
26+
# Expected Outcome
27+
<!--
28+
What did you want to happen?
29+
30+
For GUI issues, feel free to provide a mockup image of what you want it to look like.
31+
32+
For diagnostics, please provide a mockup of the desired output in a code block.
33+
-->
34+
35+
# Actual Output
36+
<!--
37+
* rustdoc console output
38+
* browser screenshot of generated html
39+
* rustdoc json (prettify by running through `jq` or running thorugh an online formatter)
40+
-->
41+
```console
42+
<code>
43+
```
44+
45+
46+
# Version
47+
<!--
48+
Available via `rustdoc --version` or under the "Help" menu.
49+
50+
If the issue involves opening the documentation in a browser, please also provide the name and version of the browser used.
51+
-->
52+
53+
# Additional Details
54+
<!-- Anything else you think is relevant -->
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
name: Future Incompatibility Tracking Issue
3+
about: A tracking issue for a future-incompatible lint
4+
title: Tracking Issue for future-incompatibility lint XXX
5+
labels: C-tracking-issue C-future-incompatibility T-compiler A-lints
6+
---
7+
<!--
8+
Thank you for creating a future-incompatible tracking issue! 📜 These issues
9+
are for lints that implement a future-incompatible warning.
10+
11+
Remember to add team labels to the tracking issue.
12+
For something that affects the language, this would be `T-lang`, and for libs
13+
it would be `T-libs-api`.
14+
Also check for any `A-` labels to add.
15+
-->
16+
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].
18+
19+
[guidelines]: https://rustc-dev-guide.rust-lang.org/bug-fix-procedure.html
20+
21+
### What is the warning for?
22+
23+
*Describe the conditions that trigger the warning.*
24+
25+
### Why was this change made?
26+
27+
*Explain why this change was made. If there is additional context, like an MCP, link it here.*
28+
29+
### Example
30+
31+
```rust
32+
// Include an example here.
33+
```
34+
35+
### Recommendations
36+
37+
*Give some recommendations on how a user can avoid the lint.*
38+
39+
### When will this warning become a hard error?
40+
41+
*If known, describe the future plans. For example, how long you anticipate this being a warning, or if there are other factors that will influence the anticipated closure.*
42+
43+
### Steps
44+
45+
- [ ] Implement the lint
46+
- [ ] Raise lint level to deny
47+
- [ ] Make lint report in dependencies
48+
- [ ] Switch to a hard error
49+
50+
### Implementation history
51+
52+
<!--
53+
Include a list of all the PRs that were involved in implementing the lint.
54+
-->

.github/workflows/ci.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ concurrency:
3434
# For a given workflow, if we push to the same branch, cancel all previous builds on that branch.
3535
# We add an exception for try builds (try branch) and unrolled rollup builds (try-perf), which
3636
# are all triggered on the same branch, but which should be able to run concurrently.
37-
group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}
37+
group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try') && github.sha) || github.ref }}
3838
cancel-in-progress: true
3939
env:
4040
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
@@ -46,33 +46,40 @@ jobs:
4646
# If you want to modify CI jobs, take a look at src/ci/github-actions/jobs.yml.
4747
calculate_matrix:
4848
name: Calculate job matrix
49-
runs-on: ubuntu-24.04
49+
runs-on: ubuntu-24.04-arm
5050
outputs:
5151
jobs: ${{ steps.jobs.outputs.jobs }}
5252
run_type: ${{ steps.jobs.outputs.run_type }}
5353
steps:
5454
- name: Checkout the source code
5555
uses: actions/checkout@v4
56-
# Cache citool to make its build faster, as it's in the critical path.
57-
# The rust-cache doesn't bleed into the main `job`, so it should not affect any other
58-
# Rust compilation.
59-
- name: Cache citool
60-
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
61-
with:
62-
workspaces: src/ci/citool
56+
- name: Test citool
57+
# Only test citool on the auto branch, to reduce latency of the calculate matrix job
58+
# on PR/try builds.
59+
if: ${{ github.ref == 'refs/heads/auto' }}
60+
run: |
61+
cd src/ci/citool
62+
CARGO_INCREMENTAL=0 cargo test
6363
- name: Calculate the CI job matrix
6464
env:
6565
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
6666
run: |
6767
cd src/ci/citool
68-
CARGO_INCREMENTAL=0 cargo test
6968
CARGO_INCREMENTAL=0 cargo run calculate-job-matrix >> $GITHUB_OUTPUT
7069
id: jobs
7170
job:
7271
name: ${{ matrix.full_name }}
7372
needs: [ calculate_matrix ]
7473
runs-on: "${{ matrix.os }}"
7574
timeout-minutes: 360
75+
# The bors environment contains secrets required for elevated workflows (try and auto builds),
76+
# which need to access e.g. S3 and upload artifacts. We want to provide access to that
77+
# environment only on the try/auto branches, which are only accessible to bors.
78+
# This also ensures that PR CI (which doesn't get write access to S3) works, as it cannot
79+
# access the environment.
80+
#
81+
# We only enable the environment for the rust-lang/rust repository, so that CI works on forks.
82+
environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto')) && 'bors') || '' }}
7683
env:
7784
CI_JOB_NAME: ${{ matrix.name }}
7885
CI_JOB_DOC_URL: ${{ matrix.doc_url }}
@@ -225,8 +232,8 @@ jobs:
225232
fi
226233
exit ${STATUS}
227234
env:
228-
AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
229-
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
235+
AWS_ACCESS_KEY_ID: ${{ secrets.CACHES_AWS_ACCESS_KEY_ID }}
236+
AWS_SECRET_ACCESS_KEY: ${{ secrets.CACHES_AWS_SECRET_ACCESS_KEY }}
230237

231238
- name: create github artifacts
232239
run: src/ci/scripts/create-doc-artifacts.sh
@@ -248,8 +255,8 @@ jobs:
248255
- name: upload artifacts to S3
249256
run: src/ci/scripts/upload-artifacts.sh
250257
env:
251-
AWS_ACCESS_KEY_ID: ${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
252-
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
258+
AWS_ACCESS_KEY_ID: ${{ secrets.ARTIFACTS_AWS_ACCESS_KEY_ID }}
259+
AWS_SECRET_ACCESS_KEY: ${{ secrets.ARTIFACTS_AWS_SECRET_ACCESS_KEY }}
253260
# Adding a condition on DEPLOY=1 or DEPLOY_ALT=1 is not needed as all deploy
254261
# builders *should* have the AWS credentials available. Still, explicitly
255262
# adding the condition is helpful as this way CI will not silently skip

.github/workflows/ghcr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
run: |
5454
# List of DockerHub images to mirror to ghcr.io
5555
images=(
56-
# Mirrored because used by the mingw-check-tidy, which doesn't cache Docker images
56+
# Mirrored because used by the tidy job, which doesn't cache Docker images
5757
"ubuntu:22.04"
58-
# Mirrored because used by all linux CI jobs, including mingw-check-tidy
58+
# Mirrored because used by all linux CI jobs, including tidy
5959
"moby/buildkit:buildx-stable-1"
6060
# Mirrored because used when CI is running inside a Docker container
6161
"alpine:3.4"

.github/workflows/post-merge.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,19 @@ jobs:
2525
env:
2626
GH_TOKEN: ${{ github.token }}
2727
run: |
28+
# Give GitHub some time to propagate the information that the PR was merged
29+
sleep 60
30+
2831
# Get closest bors merge commit
2932
PARENT_COMMIT=`git rev-list --author='bors <[email protected]>' -n1 --first-parent HEAD^1`
3033
echo "Parent: ${PARENT_COMMIT}"
3134
3235
# Find PR for the current commit
3336
HEAD_PR=`gh pr list --search "${{ github.sha }}" --state merged --json number --jq '.[0].number'`
37+
if [ -z "${HEAD_PR}" ]; then
38+
echo "PR for commit SHA ${{ github.sha }} not found, exiting"
39+
exit 1
40+
fi
3441
echo "HEAD: ${{ github.sha }} (#${HEAD_PR})"
3542
3643
cd src/ci/citool

.github/workflows/spellcheck.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# This workflow runs spellcheck job
2+
3+
name: Spellcheck
4+
on:
5+
pull_request:
6+
branches:
7+
- "**"
8+
9+
jobs:
10+
spellcheck:
11+
name: run spellchecker
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout the source code
15+
uses: actions/checkout@v4
16+
17+
- name: check typos
18+
# sync version with src/tools/tidy/src/ext_tool_checks.rs in spellcheck_runner
19+
uses: crate-ci/[email protected]
20+
with:
21+
# sync target files with src/tools/tidy/src/ext_tool_checks.rs in check_impl
22+
files: ./compiler ./library ./src/bootstrap ./src/librustdoc
23+
config: ./typos.toml

.gitmodules

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
path = src/doc/rust-by-example
1919
url = https://github.com/rust-lang/rust-by-example.git
2020
shallow = true
21-
[submodule "library/stdarch"]
22-
path = library/stdarch
23-
url = https://github.com/rust-lang/stdarch.git
24-
shallow = true
2521
[submodule "src/doc/edition-guide"]
2622
path = src/doc/edition-guide
2723
url = https://github.com/rust-lang/edition-guide.git
@@ -45,7 +41,7 @@
4541
shallow = true
4642
[submodule "src/tools/enzyme"]
4743
path = src/tools/enzyme
48-
url = https://github.com/rust-lang/Enzyme.git
44+
url = https://github.com/rust-lang/enzyme.git
4945
shallow = true
5046
[submodule "src/gcc"]
5147
path = src/gcc

.mailmap

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,13 @@ Alona Enraght-Moony <[email protected]> <[email protected]>
3434
Alona Enraght-Moony <[email protected]> <[email protected]>
3535
3636
37+
3738
3839
Ana-Maria Mihalache <[email protected]>
3940
Anatoly Ikorsky <[email protected]>
4041
Andre Bogus <[email protected]>
42+
43+
4144
Andrea Ciliberti <[email protected]>
4245
4346
Andreas Jonson <[email protected]>
@@ -116,6 +119,7 @@ Carol Willing <[email protected]>
116119
Chandler Deng <[email protected]>
117120
Charles Lew <[email protected]> CrLF0710 <[email protected]>
118121
Chris C Cerami <[email protected]> Chris C Cerami <[email protected]>
122+
119123
Chris Denton <[email protected]> Chris Denton <[email protected]>
120124
Chris Gregory <[email protected]>
121125
Chris Pardy <[email protected]>
@@ -158,8 +162,10 @@ David Carlier <[email protected]>
158162
David Klein <[email protected]>
159163
160164
David Ross <[email protected]>
161-
165+
166+
162167
168+
163169
164170
165171
dependabot[bot] <dependabot[bot]@users.noreply.github.com> <27856297+dependabot-preview[bot]@users.noreply.github.com>
@@ -403,6 +409,8 @@ Urgau <[email protected]> <[email protected]>
403409
404410
405411
Lukas Lueg <[email protected]>
412+
413+
406414
Luke Metz <[email protected]>
407415
408416
@@ -493,6 +501,7 @@ Nicolas Abram <[email protected]>
493501
Nicole Mazzuca <[email protected]>
494502
Niko Matsakis <[email protected]>
495503
504+
496505
Noratrieb <[email protected]>
497506
498507
@@ -653,7 +662,7 @@ Torsten Weber <[email protected]> <[email protected]>
653662
654663
655664
656-
Tshepang Mbambo <[email protected]>
665+
657666
Ty Overby <[email protected]>
658667
659668
Tyler Ruckinger <[email protected]>
@@ -681,6 +690,7 @@ Xinye Tao <[email protected]>
681690
Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
682691
Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
683692
York Xiang <[email protected]>
693+
684694
685695
Youngsuk Kim <[email protected]>
686696
Yuki Okushi <[email protected]>
@@ -691,3 +701,4 @@ Zach Pomerantz <[email protected]>
691701
692702
Zack Slayton <[email protected]>
693703
Zbigniew Siciarz <[email protected]> Zbigniew Siciarz <[email protected]>
704+

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ and we appreciate all of them.
55

66
The best way to get started is by asking for help in the [#new
77
members](https://rust-lang.zulipchat.com/#narrow/stream/122652-new-members)
8-
Zulip stream. We have lots of docs below of how to get started on your own, but
8+
Zulip stream. We have a lot of documentation below on how to get started on your own, but
99
the Zulip stream is the best place to *ask* for help.
1010

1111
Documentation for contributing to the compiler or tooling is located in the [Guide to Rustc
@@ -14,7 +14,7 @@ standard library in the [Standard library developers Guide][std-dev-guide], comm
1414

1515
## Making changes to subtrees and submodules
1616

17-
For submodules, changes need to be made against the repository corresponding the
17+
For submodules, changes need to be made against the repository corresponding to the
1818
submodule, and not the main `rust-lang/rust` repository.
1919

2020
For subtrees, prefer sending a PR against the subtree's repository if it does
@@ -25,15 +25,15 @@ rustc-dev-guide change that does not accompany a compiler change).
2525

2626
The [rustc-dev-guide] is meant to help document how rustc –the Rust compiler– works,
2727
as well as to help new contributors get involved in rustc development. It is recommended
28-
to read and understand the [rustc-dev-guide] before making a contribution. This guide
28+
that you read and understand the [rustc-dev-guide] before making a contribution. This guide
2929
talks about the different bots in the Rust ecosystem, the Rust development tools,
3030
bootstrapping, the compiler architecture, source code representation, and more.
3131

3232
## [Getting help](https://rustc-dev-guide.rust-lang.org/getting-started.html#asking-questions)
3333

3434
There are many ways you can get help when you're stuck. Rust has many platforms for this:
3535
[internals], [rust-zulip], and [rust-discord]. It is recommended to ask for help on
36-
the [rust-zulip], but any of these platforms are a great way to seek help and even
36+
the [rust-zulip], but any of these platforms are great ways to seek help and even
3737
find a mentor! You can learn more about asking questions and getting help in the
3838
[Asking Questions](https://rustc-dev-guide.rust-lang.org/getting-started.html#asking-questions) chapter of the [rustc-dev-guide].
3939

0 commit comments

Comments
 (0)