about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-11 06:55:48 +0000
committerbors <bors@rust-lang.org>2018-12-11 06:55:48 +0000
commitd6db67793e53ee0a4a54fdfda2ef88d5e8ae7767 (patch)
tree221e361d626cf069c70de55e7a00b0c24361308f
parent0fd7fe9a773cc68e9240ac9cbe2c5d4e5a6d0e8b (diff)
parent0c93e4cdb2f6f41fdfd484f5b529454707850570 (diff)
downloadrust-d6db67793e53ee0a4a54fdfda2ef88d5e8ae7767.tar.gz
rust-d6db67793e53ee0a4a54fdfda2ef88d5e8ae7767.zip
Auto merge of #3527 - phansch:update_readme2, r=matthiaskrgr
readme: tool lints are stable now

None
-rw-r--r--README.md20
1 files changed, 3 insertions, 17 deletions
diff --git a/README.md b/README.md
index 49c0a1f1546..f42771709fb 100644
--- a/README.md
+++ b/README.md
@@ -106,8 +106,8 @@ script:
   # etc.
 ```
 
-It might happen that clippy is not available for a certain nightly release.
-In this case you can try to conditionally install clippy from the git repo.
+It might happen that Clippy is not available for a certain nightly release.
+In this case you can try to conditionally install Clippy from the git repo.
 
 ```yaml
 language: rust
@@ -149,21 +149,7 @@ You can add options to your code to `allow`/`warn`/`deny` Clippy lints:
 
 Note: `deny` produces errors instead of warnings.
 
-Note: To use the new `clippy::lint_name` syntax, a recent compiler has to be used
-currently. If you want to compile your code with the stable toolchain you can use a `cfg_attr` to
-activate the `tool_lints` feature:
-```rust
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::lint_name))]
-```
-
-For this to work you have to use Clippy on the nightly toolchain: `cargo +nightly clippy`. If you
-want to use Clippy with the stable toolchain, you can stick to the old unscoped method to
-enable/disable Clippy lints until `tool_lints` are stable:
-```rust
-#![cfg_attr(feature = "cargo-clippy", allow(clippy_lint))]
-```
-
-If you do not want to include your lint levels in your code, you can globally enable/disable lints by passing extra flags to clippy during the run: `cargo clippy -- -A lint_name` will run clippy with `lint_name` disabled and `cargo clippy -- -W lint_name` will run it with that enabled. On newer compilers you may need to use `clippy::lint_name` instead.
+If you do not want to include your lint levels in your code, you can globally enable/disable lints by passing extra flags to Clippy during the run: `cargo clippy -- -A clippy::lint_name` will run Clippy with `lint_name` disabled and `cargo clippy -- -W clippy::lint_name` will run it with that enabled. This also works with lint groups. For example you can run Clippy with warnings for all lints enabled: `cargo clippy -- -W clippy::pedantic`
 
 ## License