From 2d467dca62917b9b29b8739fb1a0509262aeca63 Mon Sep 17 00:00:00 2001 From: chansuke Date: Mon, 29 Jul 2019 23:42:33 +0900 Subject: [PATCH 1/2] Add required negation in non_zero lint --- clippy_lints/src/len_zero.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clippy_lints/src/len_zero.rs b/clippy_lints/src/len_zero.rs index be1c2a1128d..ea302ed9fc9 100644 --- a/clippy_lints/src/len_zero.rs +++ b/clippy_lints/src/len_zero.rs @@ -244,7 +244,7 @@ fn check_len( LEN_ZERO, span, &format!("length comparison to {}", if compare_to == 0 { "zero" } else { "one" }), - "using `is_empty` is clearer and more explicit", + &format!("using `{}is_empty` is clearer and more explicit", op), format!( "{}{}.is_empty()", op, From ccc3257c91f3649126da00644c205759a941623b Mon Sep 17 00:00:00 2001 From: chansuke Date: Thu, 1 Aug 2019 22:20:08 +0900 Subject: [PATCH 2/2] Update `stderr` file --- tests/ui/len_zero.stderr | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/ui/len_zero.stderr b/tests/ui/len_zero.stderr index 9a472b31e21..6c71f1beeac 100644 --- a/tests/ui/len_zero.stderr +++ b/tests/ui/len_zero.stderr @@ -22,13 +22,13 @@ error: length comparison to zero --> $DIR/len_zero.rs:83:8 | LL | if has_is_empty.len() != 0 { - | ^^^^^^^^^^^^^^^^^^^^^^^ help: using `is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` + | ^^^^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` error: length comparison to zero --> $DIR/len_zero.rs:86:8 | LL | if has_is_empty.len() > 0 { - | ^^^^^^^^^^^^^^^^^^^^^^ help: using `is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` + | ^^^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` error: length comparison to one --> $DIR/len_zero.rs:89:8 @@ -40,7 +40,7 @@ error: length comparison to one --> $DIR/len_zero.rs:92:8 | LL | if has_is_empty.len() >= 1 { - | ^^^^^^^^^^^^^^^^^^^^^^^ help: using `is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` + | ^^^^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` error: length comparison to zero --> $DIR/len_zero.rs:103:8 @@ -52,19 +52,19 @@ error: length comparison to zero --> $DIR/len_zero.rs:106:8 | LL | if 0 != has_is_empty.len() { - | ^^^^^^^^^^^^^^^^^^^^^^^ help: using `is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` + | ^^^^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` error: length comparison to zero --> $DIR/len_zero.rs:109:8 | LL | if 0 < has_is_empty.len() { - | ^^^^^^^^^^^^^^^^^^^^^^ help: using `is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` + | ^^^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` error: length comparison to one --> $DIR/len_zero.rs:112:8 | LL | if 1 <= has_is_empty.len() { - | ^^^^^^^^^^^^^^^^^^^^^^^ help: using `is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` + | ^^^^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!has_is_empty.is_empty()` error: length comparison to one --> $DIR/len_zero.rs:115:8 @@ -82,7 +82,7 @@ error: length comparison to zero --> $DIR/len_zero.rs:142:8 | LL | if b.len() != 0 {} - | ^^^^^^^^^^^^ help: using `is_empty` is clearer and more explicit: `!b.is_empty()` + | ^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!b.is_empty()` error: aborting due to 14 previous errors