Skip to content

Commit 66f3a56

Browse files
kyle-leonhardrami3l
authored andcommitted
docs: update channel toolchain syntax
1 parent f10ada2 commit 66f3a56

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

doc/user-guide/src/concepts/toolchains.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ Standard release channel toolchain names have the following form:
1515
```
1616
<channel>[-<date>][-<host>]
1717
18-
<channel> = stable|beta|nightly|<major.minor>|<major.minor.patch>
18+
<channel> = stable|beta|nightly|<versioned>[-<prerelease>]
19+
<versioned> = <major.minor>|<major.minor.patch>
20+
<prerelease> = beta[.<number>]
1921
<date> = YYYY-MM-DD
2022
<host> = <target-triple>
2123
```

doc/user-guide/src/overrides.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ string in the following form:
122122
```
123123
(<channel>[-<date>])|<custom toolchain name>
124124
125-
<channel> = stable|beta|nightly|<major.minor.patch>
125+
<channel> = stable|beta|nightly|<versioned>[-<prerelease>]
126+
<versioned> = <major.minor>|<major.minor.patch>
127+
<prerelease> = beta[.<number>]
126128
<date> = YYYY-MM-DD
127129
```
128130

src/cli/help.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ pub(crate) static TOOLCHAIN_HELP: &str = r"Discussion:
5555
5656
<channel>[-<date>][-<host>]
5757
58-
<channel> = stable|beta|nightly|<major.minor>|<major.minor.patch>
58+
<channel> = stable|beta|nightly|<versioned>[-<prerelease>]
59+
<versioned> = <major.minor>|<major.minor.patch>
60+
<prerelease> = beta[.<number>]
5961
<date> = YYYY-MM-DD
6062
<host> = <target-triple>
6163

tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ Discussion:
2828
2929
<channel>[-<date>][-<host>]
3030
31-
<channel> = stable|beta|nightly|<major.minor>|<major.minor.patch>
31+
<channel> = stable|beta|nightly|<versioned>[-<prerelease>]
32+
<versioned> = <major.minor>|<major.minor.patch>
33+
<prerelease> = beta[.<number>]
3234
<date> = YYYY-MM-DD
3335
<host> = <target-triple>
3436

0 commit comments

Comments
 (0)