Skip to content

Commit

Permalink
Rollup merge of rust-lang#68440 - matthiaskrgr:xpyclippy, r=Mark-Simu…
Browse files Browse the repository at this point in the history
…lacrum

bootstrap: update clippy subcmd decription

Clarify where the clippy used in `./x.py clippy` is coming from.
It uses whatever clippy binary was installed via rustup, cargo-install
or otherwise and does NOT use the binary generated by `./x.py build src/tools/clippy`.
  • Loading branch information
tmandry authored Jan 22, 2020
2 parents 80b5eaf + eb2da27 commit 238cd11
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/flags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Usage: x.py <subcommand> [options] [<paths>...]
Subcommands:
build Compile either the compiler or libraries
check Compile either the compiler or libraries, using cargo check
clippy Run clippy
clippy Run clippy (uses rustup/cargo-installed clippy binary)
fix Run cargo fix
fmt Run rustfmt
test Build and run some test suites
Expand Down

0 comments on commit 238cd11

Please sign in to comment.