about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@gmail.com>2020-01-22 16:02:19 -0800
committerGitHub <noreply@github.com>2020-01-22 16:02:19 -0800
commitac3e183c4242e907c8c00f47fb15e3cb8467fe5d (patch)
tree85be9730b6525c40d96e7191c82c59d0466f83c2
parent1077adae129f140a98901f5c7fecf15f75bd8a4c (diff)
parenteb2da27af27c010bf5501bbe85341ccd457dc3d7 (diff)
Rollup merge of #68440 - matthiaskrgr:xpyclippy, r=Mark-Simulacrum
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`.
-rw-r--r--src/bootstrap/flags.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
index 1fbdd50a511..2101ef27f9d 100644
--- a/src/bootstrap/flags.rs
+++ b/src/bootstrap/flags.rs
@@ -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