Skip to content

Commit 7026c84

Browse files
authored
Rollup merge of #145554 - tshepang:rdg-sync, r=BoxyUwU
rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@c221508. Created using https://github.com/rust-lang/josh-sync. r? ```@ghost```
2 parents d5340c2 + 2787e9e commit 7026c84

File tree

6 files changed

+16
-18
lines changed

6 files changed

+16
-18
lines changed

src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: rustc-pull
33
on:
44
workflow_dispatch:
55
schedule:
6-
# Run at 04:00 UTC every Monday and Thursday
7-
- cron: '0 4 * * 1,4'
6+
# Run at 04:00 UTC every Monday
7+
- cron: '0 4 * * 1'
88

99
jobs:
1010
pull:

src/doc/rustc-dev-guide/rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6bcdcc73bd11568fd85f5a38b58e1eda054ad1cd
1+
425a9c0a0e365c0b8c6cfd00c2ded83a73bed9a0

src/doc/rustc-dev-guide/src/about-this-guide.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ You might also find the following sites useful:
7474
of the team procedures, active working groups, and the team calendar.
7575
- [std-dev-guide] -- a similar guide for developing the standard library.
7676
- [The t-compiler zulip][z]
77-
- `#contribute` and `#wg-rustup` on [Discord](https://discord.gg/rust-lang).
7877
- The [Rust Internals forum][rif], a place to ask questions and
7978
discuss Rust's internals
8079
- The [Rust reference][rr], even though it doesn't specifically talk about

src/doc/rustc-dev-guide/src/diagnostics/error-codes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ explanations should help users understand why their code cannot be accepted by
2020
the compiler. Rust prides itself on helpful error messages and long-form
2121
explanations are no exception. However, before error explanations are
2222
overhauled[^new-explanations] it is a bit open as to how exactly they should be
23-
written, as always: ask your reviewer or ask around on the Rust Discord or Zulip.
23+
written, as always: ask your reviewer or ask around on the Rust Zulip.
2424

2525
[^new-explanations]: See the draft RFC [here][new-explanations-rfc].
2626

src/doc/rustc-dev-guide/src/getting-started.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ quick guide for the most useful things. For more information, [see this
1111
chapter on how to build and run the compiler](./building/how-to-build-and-run.md).
1212

1313
[internals]: https://internals.rust-lang.org
14-
[rust-discord]: http://discord.gg/rust-lang
1514
[rust-zulip]: https://rust-lang.zulipchat.com
1615
[coc]: https://www.rust-lang.org/policies/code-of-conduct
1716
[walkthrough]: ./walkthrough.md
@@ -20,8 +19,7 @@ chapter on how to build and run the compiler](./building/how-to-build-and-run.md
2019
## Asking Questions
2120

2221
If you have questions, please make a post on the [Rust Zulip server][rust-zulip] or
23-
[internals.rust-lang.org][internals]. If you are contributing to Rustup, be aware they are not on
24-
Zulip - you can ask questions in `#wg-rustup` [on Discord][rust-discord].
22+
[internals.rust-lang.org][internals].
2523
See the [list of teams and working groups][governance] and [the Community page][community] on the
2624
official website for more resources.
2725

@@ -30,19 +28,23 @@ official website for more resources.
3028

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

33-
The compiler team (or `t-compiler`) usually hangs out in Zulip [in this
34-
"stream"][z]; it will be easiest to get questions answered there.
31+
The compiler team (or `t-compiler`) usually hangs out in Zulip in
32+
[the #t-compiler channel][z-t-compiler];
33+
questions about how the compiler works can go in [#t-compiler/help][z-help].
3534

36-
[z]: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler
35+
[z-t-compiler]: https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler
36+
[z-help]: https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp
3737

3838
**Please ask questions!** A lot of people report feeling that they are "wasting
39-
expert time", but nobody on `t-compiler` feels this way. Contributors are
39+
expert's time", but nobody on `t-compiler` feels this way. Contributors are
4040
important to us.
4141

4242
Also, if you feel comfortable, prefer public topics, as this means others can
4343
see the questions and answers, and perhaps even integrate them back into this
4444
guide :)
4545

46+
**Tip**: If you're not a native English speaker and feel unsure about writing, try using a translator to help. But avoid using LLM tools that generate long, complex words. In daily teamwork, **simple and clear words** are best for easy understanding. Even small typos or grammar mistakes can make you seem more human, and people connect better with humans.
47+
4648
### Experts
4749

4850
Not all `t-compiler` members are experts on all parts of `rustc`; it's a
@@ -162,15 +164,12 @@ incredibly helpful:
162164
- [Triaging issues][triage]: categorizing, replicating, and minimizing issues is very helpful to the Rust maintainers.
163165
- [Working groups][wg]: there are a bunch of working groups on a wide variety
164166
of rust-related things.
165-
- Answer questions in the _Get Help!_ channels on the [Rust Discord
166-
server][rust-discord], on [users.rust-lang.org][users], or on
167-
[StackOverflow][so].
167+
- Answer questions on [users.rust-lang.org][users], or on [Stack Overflow][so].
168168
- Participate in the [RFC process](https://github.com/rust-lang/rfcs).
169169
- Find a [requested community library][community-library], build it, and publish
170170
it to [Crates.io](http://crates.io). Easier said than done, but very, very
171171
valuable!
172172

173-
[rust-discord]: https://discord.gg/rust-lang
174173
[users]: https://users.rust-lang.org/
175174
[so]: http://stackoverflow.com/questions/tagged/rust
176175
[community-library]: https://github.com/rust-lang/rfcs/labels/A-community-library

src/doc/rustc-dev-guide/src/git.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,13 +338,13 @@ your fork with `git push --force-with-lease`.
338338

339339
### Keeping things up to date
340340

341-
The above section on [Rebasing](#rebasing) is a specific
341+
The [above section](#rebasing) is a specific
342342
guide on rebasing work and dealing with merge conflicts.
343343
Here is some general advice about how to keep your local repo
344344
up-to-date with upstream changes:
345345

346346
Using `git pull upstream master` while on your local master branch regularly
347-
will keep it up-to-date. You will also want to rebase your feature branches
347+
will keep it up-to-date. You will also want to keep your feature branches
348348
up-to-date as well. After pulling, you can checkout the feature branches
349349
and rebase them:
350350

0 commit comments

Comments
 (0)