Skip to content

Commit a9a7c80

Browse files
authored
Merge branch 'master' into wake-trait
2 parents 732d71a + d1e81ef commit a9a7c80

File tree

3,849 files changed

+82406
-49549
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,849 files changed

+82406
-49549
lines changed

.github/ISSUE_TEMPLATE/blank_issue.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
name: Blank Issue
3+
about: Create a blank issue.
4+
---

.github/ISSUE_TEMPLATE/bug_report.md

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
---
2+
name: Bug Report
3+
about: Create a bug report for Rust.
4+
labels: C-bug
5+
---
6+
<!--
7+
Thank you for filing a bug report! 🐛 Please provide a short summary of the bug,
8+
along with any information you feel relevant to replicating the bug.
9+
-->
10+
11+
I tried this code:
12+
13+
```rust
14+
<code>
15+
```
16+
17+
I expected to see this happen: *explanation*
18+
19+
Instead, this happened: *explanation*
20+
21+
### Meta
22+
<!--
23+
If you're using the stable version of the compiler, you should also check if the
24+
bug also exists in the beta or nightly versions.
25+
-->
26+
27+
`rustc --version --verbose`:
28+
```
29+
<version>
30+
```
31+
32+
<!--
33+
Include a backtrace in the code block by setting `RUST_BACKTRACE=1` in your
34+
environment. E.g. `RUST_BACKTRACE=1 cargo build`.
35+
-->
36+
<details><summary>Backtrace</summary>
37+
<p>
38+
39+
```
40+
<backtrace>
41+
```
42+
43+
</p>
44+
</details>

.github/ISSUE_TEMPLATE/config.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: true
2+
contact_links:
3+
- name: Rust Programming Language Forum
4+
url: https://users.rust-lang.org
5+
about: Please ask and answer questions about Rust here.

.github/ISSUE_TEMPLATE/ice.md

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
---
2+
name: Internal Compiler Error
3+
about: Create a report for an internal compiler error in rustc.
4+
labels: C-bug, I-ICE, T-compiler
5+
---
6+
<!--
7+
Thank you for finding an Internal Compiler Error! 🧊 If possible, try to provide
8+
a minimal verifiable example. You can read "Rust Bug Minimization Patterns" for
9+
how to create smaller examples.
10+
11+
http://blog.pnkfx.org/blog/2019/11/18/rust-bug-minimization-patterns/
12+
13+
-->
14+
15+
### Code
16+
17+
```
18+
<code>
19+
```
20+
21+
22+
### Meta
23+
<!--
24+
If you're using the stable version of the compiler, you should also check if the
25+
bug also exists in the beta or nightly versions.
26+
-->
27+
28+
`rustc --version --verbose`:
29+
```
30+
<version>
31+
```
32+
33+
### Error output
34+
35+
```
36+
<output>
37+
```
38+
39+
<!--
40+
Include a backtrace in the code block by setting `RUST_BACKTRACE=1` in your
41+
environment. E.g. `RUST_BACKTRACE=1 cargo build`.
42+
-->
43+
<details><summary><strong>Backtrace</strong></summary>
44+
<p>
45+
46+
```
47+
<backtrace>
48+
```
49+
50+
</p>
51+
</details>
52+
+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
name: Tracking Issue
3+
about: A tracking issue for a feature in Rust.
4+
title: Tracking Issue for XXX
5+
labels: C-tracking-issue
6+
---
7+
<!--
8+
Thank you for creating a tracking issue! 📜 Tracking issues are for tracking a
9+
feature from implementation to stabilisation. Make sure to include the relevant
10+
RFC for the feature if it has one. Otherwise provide a short summary of the
11+
feature and link any relevant PRs or issues, and remove any sections that are
12+
not relevant to the feature.
13+
14+
Remember to add team labels to the tracking issue.
15+
For a language team feature, this would e.g., be `T-lang`.
16+
Such a feature should also be labeled with e.g., `F-my_feature`.
17+
This label is used to associate issues (e.g., bugs and design questions) to the feature.
18+
-->
19+
20+
This is a tracking issue for the RFC "XXX" (rust-lang/rfcs#NNN).
21+
The feature gate for the issue is `#![feature(FFF)]`.
22+
23+
### About tracking issues
24+
25+
Tracking issues are used to record the overall progress of implementation.
26+
They are also uses as hubs connecting to other relevant issues, e.g., bugs or open design questions.
27+
A tracking issue is however *not* meant for large scale discussion, questions, or bug reports about a feature.
28+
Instead, open a dedicated issue for the specific matter and add the relevant feature gate label.
29+
30+
### Steps
31+
<!--
32+
Include each step required to complete the feature. Typically this is a PR
33+
implementing a feature, followed by a PR that stabilises the feature. However
34+
for larger features an implementation could be broken up into multiple PRs.
35+
-->
36+
37+
- [ ] Implement the RFC (cc @rust-lang/XXX -- can anyone write up mentoring
38+
instructions?)
39+
- [ ] Adjust documentation ([see instructions on rustc-dev-guide][doc-guide])
40+
- [ ] Stabilization PR ([see instructions on rustc-dev-guide][stabilization-guide])
41+
42+
[stabilization-guide]: https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#stabilization-pr
43+
[doc-guide]: https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#documentation-prs
44+
45+
### Unresolved Questions
46+
<!--
47+
Include any open questions that need to be answered before the feature can be
48+
stabilised.
49+
-->
50+
51+
XXX --- list all the "unresolved questions" found in the RFC to ensure they are
52+
not forgotten
53+
54+
### Implementation history
55+
56+
<!--
57+
Include a list of all the PRs that were involved in implementing the feature.
58+
-->

.mailmap

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# email addresses.
66
#
77

8-
Aaron Power <[email protected]> Erin Power <[email protected]>
98
Aaron Todd <[email protected]>
109
Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
1110
Adolfo Ochagavía <[email protected]>
@@ -84,6 +83,8 @@ Eric Holk <[email protected]> <[email protected]>
8483
Eric Holmes <[email protected]>
8584
8685
86+
87+
8788
8889
8990
@@ -100,6 +101,7 @@ Graydon Hoare <[email protected]> Graydon Hoare <[email protected]>
100101
Guillaume Gomez <[email protected]>
101102
Guillaume Gomez <[email protected]> ggomez <[email protected]>
102103
Guillaume Gomez <[email protected]> Guillaume Gomez <[email protected]>
104+
103105
104106
105107
Herman J. Radtke III <[email protected]> Herman J. Radtke III <[email protected]>
@@ -113,6 +115,7 @@ James Deng <[email protected]> <[email protected]>
113115
114116
James Perry <[email protected]>
115117
Jason Fager <[email protected]>
118+
116119
117120
118121
Jason Toffaletti <[email protected]> Jason Toffaletti <[email protected]>
@@ -169,6 +172,9 @@ Mateusz Mikuła <[email protected]> <[email protected]>
169172
170173
171174
Matthew Auld <[email protected]>
175+
Matthew Kraai <[email protected]>
176+
177+
172178
173179
Matthijs Hofstra <[email protected]>
174180

CONTRIBUTING.md

+14-11
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ hop on the [Rust Discord server][rust-discord] or [Rust Zulip server][rust-zulip
1919

2020
As a reminder, all contributors are expected to follow our [Code of Conduct][coc].
2121

22-
The [rustc-guide] is your friend! It describes how the compiler works and how
22+
The [rustc-dev-guide] is your friend! It describes how the compiler works and how
2323
to contribute to it in more detail than this document.
2424

2525
If this is your first time contributing, the [walkthrough] chapter of the guide
@@ -29,8 +29,8 @@ can give you a good example of how a typical contribution would go.
2929
[rust-discord]: http://discord.gg/rust-lang
3030
[rust-zulip]: https://rust-lang.zulipchat.com
3131
[coc]: https://www.rust-lang.org/conduct.html
32-
[rustc-guide]: https://rust-lang.github.io/rustc-guide/
33-
[walkthrough]: https://rust-lang.github.io/rustc-guide/walkthrough.html
32+
[rustc-dev-guide]: https://rustc-dev-guide.rust-lang.org/
33+
[walkthrough]: https://rustc-dev-guide.rust-lang.org/walkthrough.html
3434

3535
## Feature Requests
3636
[feature-requests]: #feature-requests
@@ -50,6 +50,9 @@ is a bug or not, feel free to file a bug anyway.
5050
**If you believe reporting your bug publicly represents a security risk to Rust users,
5151
please follow our [instructions for reporting security vulnerabilities](https://www.rust-lang.org/policies/security)**.
5252

53+
If you're using the nightly channel, please check if the bug exists in the
54+
latest toolchain before filing your bug. It might be fixed already.
55+
5356
If you have the chance, before reporting a bug, please [search existing
5457
issues](https://github.com/rust-lang/rust/search?q=&type=Issues&utf8=%E2%9C%93),
5558
as it's possible that someone else has already reported your error. This doesn't
@@ -100,12 +103,12 @@ $ RUST_BACKTRACE=1 rustc ...
100103
## The Build System
101104

102105
For info on how to configure and build the compiler, please see [this
103-
chapter][rustcguidebuild] of the rustc-guide. This chapter contains info for
106+
chapter][rustcguidebuild] of the rustc-dev-guide. This chapter contains info for
104107
contributions to the compiler and the standard library. It also lists some
105108
really useful commands to the build system (`./x.py`), which could save you a
106109
lot of time.
107110

108-
[rustcguidebuild]: https://rust-lang.github.io/rustc-guide/building/how-to-build-and-run.html
111+
[rustcguidebuild]: https://rustc-dev-guide.rust-lang.org/building/how-to-build-and-run.html
109112

110113
## Pull Requests
111114
[pull-requests]: #pull-requests
@@ -139,7 +142,7 @@ the issue in question.
139142
Please make sure your pull request is in compliance with Rust's style
140143
guidelines by running
141144

142-
$ python x.py test src/tools/tidy
145+
$ python x.py test tidy
143146

144147
Make this check before every pull request (and every new commit in a pull
145148
request); you can add [git hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks)
@@ -333,9 +336,9 @@ to check small fixes. For example, `rustdoc src/doc/reference.md` will render
333336
reference to `doc/reference.html`. The CSS might be messed up, but you can
334337
verify that the HTML is right.
335338

336-
Additionally, contributions to the [rustc-guide] are always welcome. Contributions
339+
Additionally, contributions to the [rustc-dev-guide] are always welcome. Contributions
337340
can be made directly at [the
338-
rust-lang/rustc-guide](https://github.com/rust-lang/rustc-guide) repo. The issue
341+
rust-lang/rustc-dev-guide](https://github.com/rust-lang/rustc-dev-guide) repo. The issue
339342
tracker in that repo is also a great way to find things that need doing. There
340343
are issues for beginners and advanced compiler devs alike!
341344

@@ -431,7 +434,7 @@ For people new to Rust, and just starting to contribute, or even for
431434
more seasoned developers, some useful places to look for information
432435
are:
433436

434-
* The [rustc guide] contains information about how various parts of the compiler work and how to contribute to the compiler
437+
* The [rustc dev guide] contains information about how various parts of the compiler work and how to contribute to the compiler
435438
* [Rust Forge][rustforge] contains additional documentation, including write-ups of how to achieve common tasks
436439
* The [Rust Internals forum][rif], a place to ask questions and
437440
discuss Rust's internals
@@ -445,13 +448,13 @@ are:
445448
* **Google!** ([search only in Rust Documentation][gsearchdocs] to find types, traits, etc. quickly)
446449
* Don't be afraid to ask! The Rust community is friendly and helpful.
447450

448-
[rustc guide]: https://rust-lang.github.io/rustc-guide/about-this-guide.html
451+
[rustc dev guide]: https://rustc-dev-guide.rust-lang.org/about-this-guide.html
449452
[gdfrustc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/
450453
[gsearchdocs]: https://www.google.com/search?q=site:doc.rust-lang.org+your+query+here
451454
[rif]: http://internals.rust-lang.org
452455
[rr]: https://doc.rust-lang.org/book/README.html
453456
[rustforge]: https://forge.rust-lang.org/
454457
[tlgba]: http://tomlee.co/2014/04/a-more-detailed-tour-of-the-rust-compiler/
455458
[ro]: http://www.rustaceans.org/
456-
[rctd]: https://rust-lang.github.io/rustc-guide/tests/intro.html
459+
[rctd]: https://rustc-dev-guide.rust-lang.org/tests/intro.html
457460
[cheatsheet]: https://buildbot2.rust-lang.org/homu/

0 commit comments

Comments
 (0)