diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-09-28 09:15:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-28 09:15:24 +0200 |
| commit | 0fd939658ecc6adc8e5b870dd50374ad8f17cd45 (patch) | |
| tree | fd7242468dbaa2aca6fc808f43f2e0806d3ca924 | |
| parent | e8578c88085b0554c1b3b6252f1d870015f39d25 (diff) | |
| parent | 8e37f0f120ba8b77889bea3fc607004c89afffb4 (diff) | |
| download | rust-0fd939658ecc6adc8e5b870dd50374ad8f17cd45.tar.gz rust-0fd939658ecc6adc8e5b870dd50374ad8f17cd45.zip | |
Rollup merge of #146788 - sysrex:146756/discord_invite, r=workingjubilee
chore: removes deprecated discord. This PR just changes the wording of the contributing document to remove the deprecated Discord. Fixes https://github.com/rust-lang/rust/issues/146756.
| -rw-r--r-- | CONTRIBUTING.md | 5 | ||||
| -rw-r--r-- | library/std/src/lib.rs | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aadc7c48ea8..2b5699dcd09 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,8 +31,8 @@ bootstrapping, the compiler architecture, source code representation, and more. ## [Getting help](https://rustc-dev-guide.rust-lang.org/getting-started.html#asking-questions) -There are many ways you can get help when you're stuck. Rust has many platforms for this: -[internals], [rust-zulip], and [rust-discord]. It is recommended to ask for help on +There are many ways you can get help when you're stuck. Rust has two platforms for this: +[internals] and [rust-zulip]. It is recommended to ask for help on the [rust-zulip], but any of these platforms are great ways to seek help and even find a mentor! You can learn more about asking questions and getting help in the [Asking Questions](https://rustc-dev-guide.rust-lang.org/getting-started.html#asking-questions) chapter of the [rustc-dev-guide]. @@ -47,5 +47,4 @@ refer to [this section][contributing-bug-reports] and [open an issue][issue temp [contributing-bug-reports]: https://rustc-dev-guide.rust-lang.org/contributing.html#bug-reports [issue template]: https://github.com/rust-lang/rust/issues/new/choose [internals]: https://internals.rust-lang.org -[rust-discord]: http://discord.gg/rust-lang [rust-zulip]: https://rust-lang.zulipchat.com diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 61b7d170b8b..da41c1216c4 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -94,7 +94,7 @@ //! pull-requests for your suggested changes. //! //! Contributions are appreciated! If you see a part of the docs that can be -//! improved, submit a PR, or chat with us first on [Discord][rust-discord] +//! improved, submit a PR, or chat with us first on [Zulip][rust-zulip] //! #docs. //! //! # A Tour of The Rust Standard Library @@ -212,7 +212,7 @@ //! [multithreading]: thread //! [other]: #what-is-in-the-standard-library-documentation //! [primitive types]: ../book/ch03-02-data-types.html -//! [rust-discord]: https://discord.gg/rust-lang +//! [rust-zulip]: https://rust-lang.zulipchat.com/ //! [array]: prim@array //! [slice]: prim@slice |