Skip to content

Commit e872da3

Browse files
committed
Apply code review feedback and fix an incorrect statement
Only rustup needs to be updated.
1 parent e1d7030 commit e872da3

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

doc/src/overrides.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,15 @@ just `nightly-2021-01-21`. The file has to be encoded in US-ASCII this case
9797
(if you are on Windows, check the encoding and that it does not start with a
9898
BOM). The legacy format is not available in `rust-toolchain.toml` files.
9999

100-
If you ever get an error like the following (when running `rustc`, `cargo` or
101-
other command)
100+
If you see the following error (when running `rustc`, `cargo` or other command)
102101

103102
```
104103
error: invalid channel name '[toolchain]' in '/PATH/TO/DIRECTORY/rust-toolchain'
105104
```
106105

107-
it means you're running `rustup` pre-1.23.0 (or just a default toolchain set by
106+
it means you're running `rustup` pre-1.23.0
108107
`rustup` pre-1.23.0) and trying to interact with a project that uses the new TOML
109-
encoding in the `rust-toolchain` file. You need to upgrade `rustup` to 1.23.0+
110-
and set the default toolchain again.
108+
encoding in the `rust-toolchain` file. You need to upgrade `rustup` to 1.23.0+.
111109

112110
The `rust-toolchain.toml`/`rust-toolchain` files are suitable to check in to
113111
source control.

0 commit comments

Comments
 (0)