diff options
| author | bors <bors@rust-lang.org> | 2019-10-03 23:29:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-03 23:29:48 +0000 |
| commit | 31d75c4e9c5318e880601d3c2cc71e5df094a120 (patch) | |
| tree | 715665644e650d0e3b22ced38a144b586a3616bf /src/bootstrap | |
| parent | 032a53a06ce293571e51bbe621a5c480e8a28e95 (diff) | |
| parent | cc5dcfaada556c5b28f7e95a26d42119bd5e98cc (diff) | |
Auto merge of #65076 - tmandry:rollup-ka7nzb6, r=tmandry
Rollup of 11 pull requests Successful merges: - #61879 (Stabilize todo macro) - #64675 (Deprecate `#![plugin]` & `#[plugin_registrar]`) - #64690 (proc_macro API: Expose `macro_rules` hygiene) - #64706 (add regression test for #60218) - #64741 (Prevent rustdoc feature doctests) - #64842 (Disallow Self in type param defaults of ADTs) - #65004 (Replace mentions of IRC with Discord) - #65018 (Set RUST_BACKTRACE=0 in tests that include a backtrace in stderr) - #65055 (Add long error explanation for E0556) - #65056 (Make visit projection iterative) - #65057 (typo: fix typo in E0392) Failed merges: r? @ghost
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/README.md | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/bootstrap/README.md b/src/bootstrap/README.md index 3e877fc4e31..c501378bff5 100644 --- a/src/bootstrap/README.md +++ b/src/bootstrap/README.md @@ -328,6 +328,8 @@ are: `Config` struct. * Adding a sanity check? Take a look at `bootstrap/sanity.rs`. -If you have any questions feel free to reach out on `#rust-infra` on IRC or ask on -internals.rust-lang.org. When you encounter bugs, please file issues on the -rust-lang/rust issue tracker. +If you have any questions feel free to reach out on `#infra` channel in the +[Rust Discord server][rust-discord] or ask on internals.rust-lang.org. When +you encounter bugs, please file issues on the rust-lang/rust issue tracker. + +[rust-discord]: https://discord.gg/rust-lang |