Skip to content

Commit ca39813

Browse files
authored
Merge branch 'rust-lang:master' into firefox_copy_paste_issue
2 parents 92bc271 + 8051f01 commit ca39813

File tree

2,835 files changed

+61555
-32924
lines changed

Some content is hidden

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

2,835 files changed

+61555
-32924
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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,18 @@ jobs:
6464
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
6565
with:
6666
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
6774
- name: Calculate the CI job matrix
6875
env:
6976
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
7077
run: |
7178
cd src/ci/citool
72-
CARGO_INCREMENTAL=0 cargo test
7379
CARGO_INCREMENTAL=0 cargo run calculate-job-matrix >> $GITHUB_OUTPUT
7480
id: jobs
7581
job:

.mailmap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,13 @@ Alona Enraght-Moony <code@alona.page> <nixon@caminus.local>
3434
Alona Enraght-Moony <code@alona.page> <contact@alona.page>
3535
Amanda Stjerna <mail@amandastjerna.se> <albin.stjerna@gmail.com>
3636
Amanda Stjerna <mail@amandastjerna.se> <amanda.stjerna@it.uu.se>
37+
Amanieu d'Antras <amanieu@gmail.com> <amanieu.dantras@huawei.com>
3738
Amos Onn <amosonn@gmail.com>
3839
Ana-Maria Mihalache <mihalacheana.maria@yahoo.com>
3940
Anatoly Ikorsky <aikorsky@gmail.com>
4041
Andre Bogus <bogusandre@gmail.com>
42+
Andre Bogus <bogusandre@gmail.com> <andre.bogus@aleph-alpha.de>
43+
Andre Bogus <bogusandre@gmail.com> <andre.bogus@ankordata.de>
4144
Andrea Ciliberti <meziu210@icloud.com>
4245
Andreas Gal <gal@mozilla.com> <andreas.gal@gmail.com>
4346
Andreas Jonson <andjo403@users.noreply.github.com>
@@ -116,6 +119,7 @@ Carol Willing <carolcode@willingconsulting.com>
116119
Chandler Deng <chandde@microsoft.com>
117120
Charles Lew <crlf0710@gmail.com> CrLF0710 <crlf0710@gmail.com>
118121
Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccerami@gmail.com>
122+
Chris Denton <chris@chrisdenton.dev> <christophersdenton@gmail.com>
119123
Chris Denton <chris@chrisdenton.dev> Chris Denton <ChrisDenton@users.noreply.github.com>
120124
Chris Gregory <czipperz@gmail.com>
121125
Chris Pardy <chrispardy36@gmail.com>
@@ -403,6 +407,8 @@ Urgau <urgau@numericable.fr> <3616612+Urgau@users.noreply.github.com>
403407
Lucy <luxx4x@protonmail.com>
404408
Lukas H. <lukaramu@users.noreply.github.com>
405409
Lukas Lueg <lukas.lueg@gmail.com>
410+
Lukas Wirth <lukastw97@gmail.com> <lukas.wirth@ferrous-systems.com>
411+
Lukas Wirth <lukastw97@gmail.com> <me@lukaswirth.dev>
406412
Luke Metz <luke.metz@students.olin.edu>
407413
Luqman Aden <me@luqman.ca> <laden@csclub.uwaterloo.ca>
408414
Luqman Aden <me@luqman.ca> <laden@mozilla.com>
@@ -493,6 +499,7 @@ Nicolas Abram <abramlujan@gmail.com>
493499
Nicole Mazzuca <npmazzuca@gmail.com>
494500
Niko Matsakis <rust@nikomatsakis.com>
495501
Niko Matsakis <rust@nikomatsakis.com> <niko@alum.mit.edu>
502+
Niko Matsakis <rust@nikomatsakis.com> <nikomat@amazon.com>
496503
Noratrieb <48135649+Noratrieb@users.noreply.github.com>
497504
Noratrieb <48135649+Noratrieb@users.noreply.github.com> <48135649+Nilstrieb@users.noreply.github.com>
498505
Noratrieb <48135649+Noratrieb@users.noreply.github.com> <nilstrieb@gmail.com>
@@ -691,3 +698,4 @@ Zach Pomerantz <zmp@umich.edu>
691698
Zack Corr <zack@z0w0.me> <zackcorr95@gmail.com>
692699
Zack Slayton <zack.slayton@gmail.com>
693700
Zbigniew Siciarz <zbigniew@siciarz.net> Zbigniew Siciarz <antyqjon@gmail.com>
701+
y21 <30553356+y21@users.noreply.github.com>

0 commit comments

Comments
 (0)