Skip to content

Commit 7bb2e6b

Browse files
Merge branch 'rust-lang:master' into patch-1
2 parents 2808bb6 + 111e9bc commit 7bb2e6b

File tree

4,989 files changed

+151502
-59097
lines changed

Some content is hidden

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

4,989 files changed

+151502
-59097
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 -->

.github/workflows/ci.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ name: CI
1111
on:
1212
push:
1313
branches:
14+
# CI on master only serves for caching citool builds for the `calculate_matrix` job.
15+
# In order to use GHA cache on PR CI (and auto/try) jobs, we need to write to it
16+
# from the default branch.
17+
- master
1418
- auto
1519
- try
1620
- try-perf
@@ -46,7 +50,7 @@ jobs:
4650
# If you want to modify CI jobs, take a look at src/ci/github-actions/jobs.yml.
4751
calculate_matrix:
4852
name: Calculate job matrix
49-
runs-on: ubuntu-24.04
53+
runs-on: ubuntu-24.04-arm
5054
outputs:
5155
jobs: ${{ steps.jobs.outputs.jobs }}
5256
run_type: ${{ steps.jobs.outputs.run_type }}
@@ -60,12 +64,18 @@ jobs:
6064
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
6165
with:
6266
workspaces: src/ci/citool
67+
- name: Test citool
68+
# Only test citool on the auto branch, to reduce latency of the calculate matrix job
69+
# on PR/try builds.
70+
if: ${{ github.ref == 'refs/heads/auto' }}
71+
run: |
72+
cd src/ci/citool
73+
CARGO_INCREMENTAL=0 cargo test
6374
- name: Calculate the CI job matrix
6475
env:
6576
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
6677
run: |
6778
cd src/ci/citool
68-
CARGO_INCREMENTAL=0 cargo test
6979
CARGO_INCREMENTAL=0 cargo run calculate-job-matrix >> $GITHUB_OUTPUT
7080
id: jobs
7181
job:

.mailmap

Lines changed: 9 additions & 1 deletion
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]>
@@ -403,6 +407,8 @@ Urgau <[email protected]> <[email protected]>
403407
404408
405409
Lukas Lueg <[email protected]>
410+
411+
406412
Luke Metz <[email protected]>
407413
408414
@@ -493,6 +499,7 @@ Nicolas Abram <[email protected]>
493499
Nicole Mazzuca <[email protected]>
494500
Niko Matsakis <[email protected]>
495501
502+
496503
Noratrieb <[email protected]>
497504
498505
@@ -653,7 +660,7 @@ Torsten Weber <[email protected]> <[email protected]>
653660
654661
655662
656-
Tshepang Mbambo <[email protected]>
663+
657664
Ty Overby <[email protected]>
658665
659666
Tyler Ruckinger <[email protected]>
@@ -691,3 +698,4 @@ Zach Pomerantz <[email protected]>
691698
692699
Zack Slayton <[email protected]>
693700
Zbigniew Siciarz <[email protected]> Zbigniew Siciarz <[email protected]>
701+

0 commit comments

Comments
 (0)