diff options
| author | ThibsG <Thibs@debian.com> | 2020-02-04 08:20:49 +0100 |
|---|---|---|
| committer | ThibsG <Thibs@debian.com> | 2020-02-04 22:53:24 +0100 |
| commit | 53094de08efea5f4f4ff2d5e8e7381bf8aede625 (patch) | |
| tree | 0d587c74246efca3648d67d6307bd0334cdfabd1 | |
| parent | b29aacfec8b45aad12288b011a23fc2dea38d0fc (diff) | |
| download | rust-53094de08efea5f4f4ff2d5e8e7381bf8aede625.tar.gz rust-53094de08efea5f4f4ff2d5e8e7381bf8aede625.zip | |
Merge fixes
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/lintlist/mod.rs | 2 | ||||
| -rw-r--r-- | tests/ui/println_empty_string.fixed | 1 | ||||
| -rw-r--r-- | tests/ui/println_empty_string.rs | 1 | ||||
| -rw-r--r-- | tests/ui/println_empty_string.stderr | 4 |
5 files changed, 6 insertions, 4 deletions
diff --git a/README.md b/README.md index b68eb3ed7fa..da02591f690 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code. -[There are 351 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html) +[There are 352 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html) We have a bunch of lint categories to allow you to choose how much Clippy is supposed to ~~annoy~~ help you: diff --git a/src/lintlist/mod.rs b/src/lintlist/mod.rs index b28a0917a91..7d2aedd667d 100644 --- a/src/lintlist/mod.rs +++ b/src/lintlist/mod.rs @@ -6,7 +6,7 @@ pub use lint::Lint; pub use lint::LINT_LEVELS; // begin lint list, do not remove this comment, it’s used in `update_lints` -pub const ALL_LINTS: [Lint; 351] = [ +pub const ALL_LINTS: [Lint; 352] = [ Lint { name: "absurd_extreme_comparisons", group: "correctness", diff --git a/tests/ui/println_empty_string.fixed b/tests/ui/println_empty_string.fixed index 4e84511d7b0..2b889b62ea9 100644 --- a/tests/ui/println_empty_string.fixed +++ b/tests/ui/println_empty_string.fixed @@ -1,4 +1,5 @@ // run-rustfix +#![allow(clippy::match_single_binding)] fn main() { println!(); diff --git a/tests/ui/println_empty_string.rs b/tests/ui/println_empty_string.rs index 9fdfb03a366..890f5f68476 100644 --- a/tests/ui/println_empty_string.rs +++ b/tests/ui/println_empty_string.rs @@ -1,4 +1,5 @@ // run-rustfix +#![allow(clippy::match_single_binding)] fn main() { println!(); diff --git a/tests/ui/println_empty_string.stderr b/tests/ui/println_empty_string.stderr index 689624a0fa0..23112b88168 100644 --- a/tests/ui/println_empty_string.stderr +++ b/tests/ui/println_empty_string.stderr @@ -1,5 +1,5 @@ error: using `println!("")` - --> $DIR/println_empty_string.rs:5:5 + --> $DIR/println_empty_string.rs:6:5 | LL | println!(""); | ^^^^^^^^^^^^ help: replace it with: `println!()` @@ -7,7 +7,7 @@ LL | println!(""); = note: `-D clippy::println-empty-string` implied by `-D warnings` error: using `println!("")` - --> $DIR/println_empty_string.rs:8:14 + --> $DIR/println_empty_string.rs:9:14 | LL | _ => println!(""), | ^^^^^^^^^^^^ help: replace it with: `println!()` |