Skip to content

Commit e2c5d2e

Browse files
committed
Auto merge of #5040 - daboross:patch-1, r=alexcrichton
Remove cargo-only downloads from installation docs This also copies extra instructions for installing rust from https://doc.rust-lang.org/book/first-edition/getting-started.html#installing-rust-1. I wasn't able to test the changes locally, but they're fairly minimal, so I trust they will render alright. Fixes #5027.
2 parents d0ca5bc + 3e4d155 commit e2c5d2e

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed
Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,37 @@
11
## Installation
22

3-
### Install Stable Rust and Cargo
3+
### Install Rust and Cargo
44

5-
The easiest way to get Cargo is to get the current stable release of [Rust] by
6-
using the `rustup` script:
5+
The easiest way to get Cargo is to install the current stable release of [Rust]
6+
by using `rustup`.
7+
8+
On Linux and macOS systems, this is done as follows:
79

810
```console
911
$ curl -sSf https://static.rust-lang.org/rustup.sh | sh
1012
```
1113

12-
After this, you can use the `rustup` command to also install `beta` or `nightly`
13-
channels for Rust and Cargo.
14+
It will download a script, and start the installation. If everything goes well,
15+
you’ll see this appear:
16+
17+
```console
18+
Rust is installed now. Great!
19+
```
1420

15-
### Install Nightly Cargo
21+
On Windows, download and run [rustup-init.exe]. It will start the installation
22+
in a console and present the above message on success.
1623

17-
To install just Cargo, the current recommended installation method is through
18-
the official nightly builds. Note that Cargo will also require that [Rust] is
19-
already installed on the system.
24+
After this, you can use the `rustup` command to also install `beta` or `nightly`
25+
channels for Rust and Cargo.
2026

21-
| Platform | 64-bit | 32-bit |
22-
|------------------|-------------------|-------------------|
23-
| Linux binaries | [tar.gz][linux64] | [tar.gz][linux32] |
24-
| MacOS binaries | [tar.gz][mac64] | [tar.gz][mac32] |
25-
| Windows binaries | [tar.gz][win64] | [tar.gz][win32] |
27+
For other installation options and information, visit the
28+
[install][install-rust] page of the Rust website.
2629

2730
### Build and Install Cargo from Source
2831

2932
Alternatively, you can [build Cargo from source][compiling-from-source].
3033

3134
[rust]: https://www.rust-lang.org/
32-
[linux64]: https://static.rust-lang.org/cargo-dist/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz
33-
[linux32]: https://static.rust-lang.org/cargo-dist/cargo-nightly-i686-unknown-linux-gnu.tar.gz
34-
[mac64]: https://static.rust-lang.org/cargo-dist/cargo-nightly-x86_64-apple-darwin.tar.gz
35-
[mac32]: https://static.rust-lang.org/cargo-dist/cargo-nightly-i686-apple-darwin.tar.gz
36-
[win64]: https://static.rust-lang.org/cargo-dist/cargo-nightly-x86_64-pc-windows-gnu.tar.gz
37-
[win32]: https://static.rust-lang.org/cargo-dist/cargo-nightly-i686-pc-windows-gnu.tar.gz
35+
[rustup-init.exe]: https://win.rustup.rs/
36+
[install-rust]: https://www.rust-lang.org/install.html
3837
[compiling-from-source]: https://github.com/rust-lang/cargo#compiling-from-source

0 commit comments

Comments
 (0)