Skip to content

Commit 75111de

Browse files
authored
Merge pull request #3165 from phansch/cleanup_readme_for_clippy_preview_on_stable
Cleanup README for clippy-preview on stable
2 parents 07cb45b + c42cd60 commit 75111de

File tree

2 files changed

+5
-56
lines changed

2 files changed

+5
-56
lines changed

README.md

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ subcommand.
4545
#### Step 1: Install rustup
4646

4747
You can install [rustup](http://rustup.rs/) on supported platforms. This will help
48-
us install clippy and its dependencies.
48+
us install Clippy and its dependencies.
4949

5050
If you already have rustup installed, update to ensure you have the latest
5151
rustup and compiler:
@@ -54,26 +54,15 @@ rustup and compiler:
5454
rustup update
5555
```
5656

57-
#### Step 2: Install nightly toolchain
57+
#### Step 2: Install Clippy
5858

59-
Rustup integration is still new, you will need a relatively new nightly (2018-07-15 or later).
60-
61-
To install Rust nightly with [rustup](https://rustup.rs/):
59+
Once you have rustup and the latest stable release (at least Rust 1.29) installed, run the following command:
6260

6361
```terminal
64-
rustup install nightly
62+
rustup component add clippy-preview
6563
```
6664

67-
#### Step 3: Install clippy
68-
69-
Once you have rustup and the nightly toolchain installed, run the following command:
70-
71-
```terminal
72-
rustup component add clippy-preview --toolchain=nightly
73-
```
74-
75-
Now you can run Clippy by invoking `cargo +nightly clippy`. If nightly is your
76-
default toolchain in rustup, `cargo clippy` will work fine.
65+
Now you can run Clippy by invoking `cargo clippy`.
7766

7867
### Running Clippy from the command line without installing it
7968

@@ -133,15 +122,6 @@ enable/disable Clippy lints until `tool_lints` are stable:
133122
#![cfg_attr(feature = "cargo-clippy", allow(clippy_lint))]
134123
```
135124

136-
## Updating rustc
137-
138-
Sometimes, rustc moves forward without Clippy catching up. Therefore updating
139-
rustc may leave Clippy a non-functional state until we fix the resulting
140-
breakage.
141-
142-
You can use the [rust-update](rust-update) script to update rustc only if
143-
Clippy would also update correctly.
144-
145125
## License
146126

147127
Licensed under [MPL](https://www.mozilla.org/MPL/2.0/).

rust-update

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)