Skip to content

Commit 51dd307

Browse files
authored
Rollup merge of rust-lang#65004 - BO41:mentions, r=alexcrichton
Replace mentions of IRC with Discord Revival of rust-lang#61531 closes rust-lang#61524 what was the outcome of this? rust-lang#61531 (comment) should this be changed in this PR as well? rust-lang#61531 (comment)
2 parents 4cc2872 + 2ab7a67 commit 51dd307

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ In the Rust community we strive to go the extra step to look out for each other.
3333

3434
And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could've communicated better — remember that it's your responsibility to make your fellow Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust.
3535

36-
The enforcement policies listed above apply to all official Rust venues; including official IRC channels (#rust, #rust-internals, #rust-tools, #rust-libs, #rustc, #rust-beginners, #rust-docs, #rust-community, #rust-lang, and #cargo); GitHub repositories under rust-lang, rust-lang-nursery, and rust-lang-deprecated; and all forums under rust-lang.org (users.rust-lang.org, internals.rust-lang.org). For other projects adopting the Rust Code of Conduct, please contact the maintainers of those projects for enforcement. If you wish to use this code of conduct for your own project, consider explicitly mentioning your moderation policy or making a copy with your own moderation policy so as to avoid confusion.
36+
The enforcement policies listed above apply to all official Rust venues; including all communication channels (Rust Discord server, Rust Zulip server); GitHub repositories under rust-lang, rust-lang-nursery, and rust-lang-deprecated; and all forums under rust-lang.org (users.rust-lang.org, internals.rust-lang.org). For other projects adopting the Rust Code of Conduct, please contact the maintainers of those projects for enforcement. If you wish to use this code of conduct for your own project, consider explicitly mentioning your moderation policy or making a copy with your own moderation policy so as to avoid confusion.
3737

3838
*Adapted from the [Node.js Policy on Trolling](https://blog.izs.me/2012/08/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).*
3939

CONTRIBUTING.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ links to the major sections:
1515
* [Helpful Links and Information](#helpful-links-and-information)
1616

1717
If you have questions, please make a post on [internals.rust-lang.org][internals] or
18-
hop on the [Rust Discord server][rust-discord], [Rust Zulip server][rust-zulip] or [#rust-internals][pound-rust-internals].
18+
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

@@ -25,7 +25,6 @@ to contribute to it in more detail than this document.
2525
If this is your first time contributing, the [walkthrough] chapter of the guide
2626
can give you a good example of how a typical contribution would go.
2727

28-
[pound-rust-internals]: https://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
2928
[internals]: https://internals.rust-lang.org
3029
[rust-discord]: http://discord.gg/rust-lang
3130
[rust-zulip]: https://rust-lang.zulipchat.com
@@ -404,7 +403,7 @@ If you're looking for somewhere to start, check out the [E-easy][eeasy] tag.
404403
There are a number of other ways to contribute to Rust that don't deal with
405404
this repository.
406405

407-
Answer questions in [#rust][pound-rust], or on [users.rust-lang.org][users],
406+
Answer questions in the _Get Help!_ channels from the [Rust Discord server][rust-discord], on [users.rust-lang.org][users],
408407
or on [StackOverflow][so].
409408

410409
Participate in the [RFC process](https://github.com/rust-lang/rfcs).
@@ -413,7 +412,7 @@ Find a [requested community library][community-library], build it, and publish
413412
it to [Crates.io](http://crates.io). Easier said than done, but very, very
414413
valuable!
415414

416-
[pound-rust]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust
415+
[rust-discord]: https://discord.gg/rust-lang
417416
[users]: https://users.rust-lang.org/
418417
[so]: http://stackoverflow.com/questions/tagged/rust
419418
[community-library]: https://github.com/rust-lang/rfcs/labels/A-community-library

README.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -244,19 +244,17 @@ The Rust community congregates in a few places:
244244
245245
To contribute to Rust, please see [CONTRIBUTING](CONTRIBUTING.md).
246246
247-
Rust has an [IRC] culture and most real-time collaboration happens in a
248-
variety of channels on Mozilla's IRC network, irc.mozilla.org. The
249-
most popular channel is [#rust], a venue for general discussion about
250-
Rust. And a good place to ask for help would be [#rust-beginners].
247+
Most real-time collaboration happens in a variety of channels on the
248+
[Rust Discord server][rust-discord], with channels dedicated for getting help,
249+
community, documentation, and all major contribution areas in the Rust ecosystem.
250+
A good place to ask for help would be the #help channel.
251251
252252
The [rustc guide] might be a good place to start if you want to find out how
253253
various parts of the compiler work.
254254
255255
Also, you may find the [rustdocs for the compiler itself][rustdocs] useful.
256256
257-
[IRC]: https://en.wikipedia.org/wiki/Internet_Relay_Chat
258-
[#rust]: irc://irc.mozilla.org/rust
259-
[#rust-beginners]: irc://irc.mozilla.org/rust-beginners
257+
[rust-discord]: https://discord.gg/rust-lang
260258
[rustc guide]: https://rust-lang.github.io/rustc-guide/about-this-guide.html
261259
[rustdocs]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/
262260

src/bootstrap/README.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,8 @@ are:
328328
`Config` struct.
329329
* Adding a sanity check? Take a look at `bootstrap/sanity.rs`.
330330

331-
If you have any questions feel free to reach out on `#rust-infra` on IRC or ask on
332-
internals.rust-lang.org. When you encounter bugs, please file issues on the
333-
rust-lang/rust issue tracker.
331+
If you have any questions feel free to reach out on `#infra` channel in the
332+
[Rust Discord server][rust-discord] or ask on internals.rust-lang.org. When
333+
you encounter bugs, please file issues on the rust-lang/rust issue tracker.
334+
335+
[rust-discord]: https://discord.gg/rust-lang

0 commit comments

Comments
 (0)