diff --git a/src/infra/channel-layout.md b/src/infra/channel-layout.md index 40168895f..b0c50ed6d 100644 --- a/src/infra/channel-layout.md +++ b/src/infra/channel-layout.md @@ -74,7 +74,7 @@ There are then a number of top level sections (tables) which are: `["rustc", "cargo", "rust-std", "rust-docs", "rustfmt", "clippy"]`. Other profiles include `minimal` (`["rustc", "cargo", "rust-std"]`) and - `complete` which adds in additional tools such as the `rls`, a copy of the + `complete` which adds in additional things such as a copy of the standard library source (`rust-src`), `miri`, `lldb`, `llvm-tools`, and `rust-analysis`. diff --git a/src/infra/docs/rustc-ci.md b/src/infra/docs/rustc-ci.md index 0f65a191c..7db63c16f 100644 --- a/src/infra/docs/rustc-ci.md +++ b/src/infra/docs/rustc-ci.md @@ -205,7 +205,7 @@ saw before. ### Toolstate to support allowed failures The `rust-lang/rust` repo doesn’t only test the compiler on its CI, but also -all the tools distributed through rustup (like rls, rustfmt, clippy…). Since +all the tools distributed through rustup (like miri). Since those tools rely on the compiler internals (which don’t have any kind of stability guarantee) they often break after the compiler code is changed. diff --git a/src/infra/toolstate.md b/src/infra/toolstate.md index 7d85c999a..d97211255 100644 --- a/src/infra/toolstate.md +++ b/src/infra/toolstate.md @@ -1,7 +1,7 @@ # Handling of tools embedded in the rustc repo ("toolstate") The Rust repository contains several external tools and documents as git -submodules (e.g. miri, rls, the [Book], the [Reference]). Many of those are +submodules (e.g. miri, the [Book], the [Reference]). Some of those are very tightly coupled to the compiler and depend on internal APIs that change all the time, but they are not actually essential to get the compiler itself to work. To make API changes less painful, these tools are allowed to "break" @@ -31,8 +31,8 @@ rules are for when which tools are (not) allowed to break. cut. (See the [Forge index][forge] for when the next beta cutoff is happening.) - At the time of writing, the following tools are "nightly only": rustc-dev-guide, - miri, RLS, embedded-book. + At the time of writing, the following tools are "nightly only": + miri, embedded-book. ## Updating the toolstate repository @@ -57,7 +57,7 @@ Tools can be updated by updating the submodule to the proper commit. Run `git submodule update --remote path/to/submodule`, add the updates, make sure the tests pass, commit, and send a pull request. The path is from the root of the rust repository, so for example, the reference is -`src/doc/reference` and rls is `src/tools/rls`. +`src/doc/reference` and miri is `src/tools/miri`. While not required, [subup] may assist you with this.