From 2c04c1a188124402e85d78bc78c4e07bf87014d0 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:58:41 +0200
Subject: [PATCH 1/4] [`manual_assert`]: Preserve comments in the suggestion
---
clippy_lints/src/manual_assert.rs | 40 ++++++----
clippy_utils/src/lib.rs | 23 ++++++
tests/ui/manual_assert.edition2018.fixed | 16 +++-
tests/ui/manual_assert.edition2018.stderr | 90 ++++++++++++++++++-----
tests/ui/manual_assert.edition2021.fixed | 16 +++-
tests/ui/manual_assert.edition2021.stderr | 90 ++++++++++++++++++-----
tests/ui/manual_assert.rs | 13 ++++
7 files changed, 237 insertions(+), 51 deletions(-)
diff --git a/clippy_lints/src/manual_assert.rs b/clippy_lints/src/manual_assert.rs
index 26b53ab5d68..9934c06e723 100644
--- a/clippy_lints/src/manual_assert.rs
+++ b/clippy_lints/src/manual_assert.rs
@@ -1,9 +1,10 @@
-use clippy_utils::diagnostics::span_lint_and_sugg;
+use crate::rustc_lint::LintContext;
+use clippy_utils::diagnostics::span_lint_and_then;
use clippy_utils::macros::{root_macro_call, FormatArgsExpn};
use clippy_utils::source::snippet_with_applicability;
-use clippy_utils::{peel_blocks_with_stmt, sugg};
+use clippy_utils::{peel_blocks_with_stmt, span_extract_comment, sugg};
use rustc_errors::Applicability;
-use rustc_hir::{Expr, ExprKind, UnOp};
+use rustc_hir::{Expr, ExprKind};
use rustc_lint::{LateContext, LateLintPass};
use rustc_session::{declare_lint_pass, declare_tool_lint};
use rustc_span::sym;
@@ -50,20 +51,33 @@ impl<'tcx> LateLintPass<'tcx> for ManualAssert {
let mut applicability = Applicability::MachineApplicable;
let format_args_snip = snippet_with_applicability(cx, format_args.inputs_span(), "..", &mut applicability);
let cond = cond.peel_drop_temps();
- let (cond, not) = match cond.kind {
- ExprKind::Unary(UnOp::Not, e) => (e, ""),
- _ => (cond, "!"),
- };
- let cond_sugg = sugg::Sugg::hir_with_applicability(cx, cond, "..", &mut applicability).maybe_par();
- let sugg = format!("assert!({not}{cond_sugg}, {format_args_snip});");
- span_lint_and_sugg(
+ let mut comments = span_extract_comment(cx.sess().source_map(), expr.span);
+ if !comments.is_empty() {
+ comments += "\n";
+ }
+ // we need to negate the <cond> expression because `assert!` panics when <cond> is `false`, wherease original pattern panicked when evaluating to `true`
+ let cond_sugg = !sugg::Sugg::hir_with_applicability(cx, cond, "..", &mut applicability);
+ let sugg = format!("assert!({cond_sugg}, {format_args_snip});");
+ // we show to the user the suggestion without the comments, but when applicating the fix, include the comments in the block
+ span_lint_and_then(
cx,
MANUAL_ASSERT,
expr.span,
"only a `panic!` in `if`-then statement",
- "try",
- sugg,
- Applicability::MachineApplicable,
+ |diag| {
+ // comments can be noisy, do not show them to the user
+ diag.tool_only_span_suggestion(
+ expr.span.shrink_to_lo(),
+ "add comments back",
+ comments,
+ applicability);
+ diag.span_suggestion(
+ expr.span,
+ "try instead",
+ sugg,
+ applicability);
+ }
+
);
}
}
diff --git a/clippy_utils/src/lib.rs b/clippy_utils/src/lib.rs
index c2c52d08a3c..d67ceaec035 100644
--- a/clippy_utils/src/lib.rs
+++ b/clippy_utils/src/lib.rs
@@ -2295,6 +2295,29 @@ pub fn span_contains_comment(sm: &SourceMap, span: Span) -> bool {
});
}
+/// Return all the comments a given span contains
+/// Comments are returned wrapped with their relevant delimiters
+pub fn span_extract_comment(sm: &SourceMap, span: Span) -> String {
+ let snippet = sm.span_to_snippet(span).unwrap_or_default();
+ let mut comments_buf: Vec<String> = Vec::new();
+ let mut index: usize = 0;
+
+ for token in tokenize(&snippet) {
+ let token_range = index..(index + token.len as usize);
+ index += token.len as usize;
+ match token.kind {
+ TokenKind::BlockComment { .. } | TokenKind::LineComment { .. } => {
+ if let Some(comment) = snippet.get(token_range) {
+ comments_buf.push(comment.to_string());
+ }
+ },
+ _ => (),
+ }
+ }
+
+ comments_buf.join("\n")
+}
+
macro_rules! op_utils {
($($name:ident $assign:ident)*) => {
/// Binary operation traits like `LangItem::Add`
diff --git a/tests/ui/manual_assert.edition2018.fixed b/tests/ui/manual_assert.edition2018.fixed
index 65598f1eacc..b5ccc07e49e 100644
--- a/tests/ui/manual_assert.edition2018.fixed
+++ b/tests/ui/manual_assert.edition2018.fixed
@@ -5,6 +5,7 @@
#![warn(clippy::manual_assert)]
#![allow(clippy::nonminimal_bool)]
+#![allow(dead_code)]
macro_rules! one {
() => {
@@ -27,8 +28,8 @@ fn main() {
{
panic!("qaqaq{:?}", a);
}
- assert!(a.is_empty(), "qaqaq{:?}", a);
- assert!(a.is_empty(), "qwqwq");
+ assert!(!(!a.is_empty()), "qaqaq{:?}", a);
+ assert!(!(!a.is_empty()), "qwqwq");
if a.len() == 3 {
println!("qwq");
println!("qwq");
@@ -50,3 +51,14 @@ fn main() {
assert!(!(a.is_empty() || !b.is_empty()), "panic5");
assert!(!a.is_empty(), "with expansion {}", one!());
}
+
+fn issue7730() {
+ // Suggestion should preserve comment
+ // comment
+/* this is a
+ multiline
+ comment */
+/// Doc comment
+// comment after `panic!`
+assert!(!true, "panic with comment");
+}
diff --git a/tests/ui/manual_assert.edition2018.stderr b/tests/ui/manual_assert.edition2018.stderr
index a0f31afd6eb..df22e0114be 100644
--- a/tests/ui/manual_assert.edition2018.stderr
+++ b/tests/ui/manual_assert.edition2018.stderr
@@ -1,68 +1,124 @@
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:30:5
+ --> $DIR/manual_assert.rs:31:5
|
LL | / if !a.is_empty() {
LL | | panic!("qaqaq{:?}", a);
LL | | }
- | |_____^ help: try: `assert!(a.is_empty(), "qaqaq{:?}", a);`
+ | |_____^
|
= note: `-D clippy::manual-assert` implied by `-D warnings`
+help: try instead
+ |
+LL | assert!(!(!a.is_empty()), "qaqaq{:?}", a);
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:33:5
+ --> $DIR/manual_assert.rs:34:5
|
LL | / if !a.is_empty() {
LL | | panic!("qwqwq");
LL | | }
- | |_____^ help: try: `assert!(a.is_empty(), "qwqwq");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!(!a.is_empty()), "qwqwq");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:50:5
+ --> $DIR/manual_assert.rs:51:5
|
LL | / if b.is_empty() {
LL | | panic!("panic1");
LL | | }
- | |_____^ help: try: `assert!(!b.is_empty(), "panic1");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!b.is_empty(), "panic1");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:53:5
+ --> $DIR/manual_assert.rs:54:5
|
LL | / if b.is_empty() && a.is_empty() {
LL | | panic!("panic2");
LL | | }
- | |_____^ help: try: `assert!(!(b.is_empty() && a.is_empty()), "panic2");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!(b.is_empty() && a.is_empty()), "panic2");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:56:5
+ --> $DIR/manual_assert.rs:57:5
|
LL | / if a.is_empty() && !b.is_empty() {
LL | | panic!("panic3");
LL | | }
- | |_____^ help: try: `assert!(!(a.is_empty() && !b.is_empty()), "panic3");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!(a.is_empty() && !b.is_empty()), "panic3");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:59:5
+ --> $DIR/manual_assert.rs:60:5
|
LL | / if b.is_empty() || a.is_empty() {
LL | | panic!("panic4");
LL | | }
- | |_____^ help: try: `assert!(!(b.is_empty() || a.is_empty()), "panic4");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!(b.is_empty() || a.is_empty()), "panic4");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:62:5
+ --> $DIR/manual_assert.rs:63:5
|
LL | / if a.is_empty() || !b.is_empty() {
LL | | panic!("panic5");
LL | | }
- | |_____^ help: try: `assert!(!(a.is_empty() || !b.is_empty()), "panic5");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!(a.is_empty() || !b.is_empty()), "panic5");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:65:5
+ --> $DIR/manual_assert.rs:66:5
|
LL | / if a.is_empty() {
LL | | panic!("with expansion {}", one!())
LL | | }
- | |_____^ help: try: `assert!(!a.is_empty(), "with expansion {}", one!());`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!a.is_empty(), "with expansion {}", one!());
+ |
-error: aborting due to 8 previous errors
+error: only a `panic!` in `if`-then statement
+ --> $DIR/manual_assert.rs:73:5
+ |
+LL | / if true {
+LL | | // comment
+LL | | /* this is a
+LL | | multiline
+... |
+LL | | panic!("panic with comment") // comment after `panic!`
+LL | | }
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!true, "panic with comment");
+ |
+
+error: aborting due to 9 previous errors
diff --git a/tests/ui/manual_assert.edition2021.fixed b/tests/ui/manual_assert.edition2021.fixed
index 65598f1eacc..b5ccc07e49e 100644
--- a/tests/ui/manual_assert.edition2021.fixed
+++ b/tests/ui/manual_assert.edition2021.fixed
@@ -5,6 +5,7 @@
#![warn(clippy::manual_assert)]
#![allow(clippy::nonminimal_bool)]
+#![allow(dead_code)]
macro_rules! one {
() => {
@@ -27,8 +28,8 @@ fn main() {
{
panic!("qaqaq{:?}", a);
}
- assert!(a.is_empty(), "qaqaq{:?}", a);
- assert!(a.is_empty(), "qwqwq");
+ assert!(!(!a.is_empty()), "qaqaq{:?}", a);
+ assert!(!(!a.is_empty()), "qwqwq");
if a.len() == 3 {
println!("qwq");
println!("qwq");
@@ -50,3 +51,14 @@ fn main() {
assert!(!(a.is_empty() || !b.is_empty()), "panic5");
assert!(!a.is_empty(), "with expansion {}", one!());
}
+
+fn issue7730() {
+ // Suggestion should preserve comment
+ // comment
+/* this is a
+ multiline
+ comment */
+/// Doc comment
+// comment after `panic!`
+assert!(!true, "panic with comment");
+}
diff --git a/tests/ui/manual_assert.edition2021.stderr b/tests/ui/manual_assert.edition2021.stderr
index a0f31afd6eb..df22e0114be 100644
--- a/tests/ui/manual_assert.edition2021.stderr
+++ b/tests/ui/manual_assert.edition2021.stderr
@@ -1,68 +1,124 @@
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:30:5
+ --> $DIR/manual_assert.rs:31:5
|
LL | / if !a.is_empty() {
LL | | panic!("qaqaq{:?}", a);
LL | | }
- | |_____^ help: try: `assert!(a.is_empty(), "qaqaq{:?}", a);`
+ | |_____^
|
= note: `-D clippy::manual-assert` implied by `-D warnings`
+help: try instead
+ |
+LL | assert!(!(!a.is_empty()), "qaqaq{:?}", a);
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:33:5
+ --> $DIR/manual_assert.rs:34:5
|
LL | / if !a.is_empty() {
LL | | panic!("qwqwq");
LL | | }
- | |_____^ help: try: `assert!(a.is_empty(), "qwqwq");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!(!a.is_empty()), "qwqwq");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:50:5
+ --> $DIR/manual_assert.rs:51:5
|
LL | / if b.is_empty() {
LL | | panic!("panic1");
LL | | }
- | |_____^ help: try: `assert!(!b.is_empty(), "panic1");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!b.is_empty(), "panic1");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:53:5
+ --> $DIR/manual_assert.rs:54:5
|
LL | / if b.is_empty() && a.is_empty() {
LL | | panic!("panic2");
LL | | }
- | |_____^ help: try: `assert!(!(b.is_empty() && a.is_empty()), "panic2");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!(b.is_empty() && a.is_empty()), "panic2");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:56:5
+ --> $DIR/manual_assert.rs:57:5
|
LL | / if a.is_empty() && !b.is_empty() {
LL | | panic!("panic3");
LL | | }
- | |_____^ help: try: `assert!(!(a.is_empty() && !b.is_empty()), "panic3");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!(a.is_empty() && !b.is_empty()), "panic3");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:59:5
+ --> $DIR/manual_assert.rs:60:5
|
LL | / if b.is_empty() || a.is_empty() {
LL | | panic!("panic4");
LL | | }
- | |_____^ help: try: `assert!(!(b.is_empty() || a.is_empty()), "panic4");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!(b.is_empty() || a.is_empty()), "panic4");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:62:5
+ --> $DIR/manual_assert.rs:63:5
|
LL | / if a.is_empty() || !b.is_empty() {
LL | | panic!("panic5");
LL | | }
- | |_____^ help: try: `assert!(!(a.is_empty() || !b.is_empty()), "panic5");`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!(a.is_empty() || !b.is_empty()), "panic5");
+ |
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:65:5
+ --> $DIR/manual_assert.rs:66:5
|
LL | / if a.is_empty() {
LL | | panic!("with expansion {}", one!())
LL | | }
- | |_____^ help: try: `assert!(!a.is_empty(), "with expansion {}", one!());`
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!a.is_empty(), "with expansion {}", one!());
+ |
-error: aborting due to 8 previous errors
+error: only a `panic!` in `if`-then statement
+ --> $DIR/manual_assert.rs:73:5
+ |
+LL | / if true {
+LL | | // comment
+LL | | /* this is a
+LL | | multiline
+... |
+LL | | panic!("panic with comment") // comment after `panic!`
+LL | | }
+ | |_____^
+ |
+help: try instead
+ |
+LL | assert!(!true, "panic with comment");
+ |
+
+error: aborting due to 9 previous errors
diff --git a/tests/ui/manual_assert.rs b/tests/ui/manual_assert.rs
index 4d2706dd621..e9dd81a758a 100644
--- a/tests/ui/manual_assert.rs
+++ b/tests/ui/manual_assert.rs
@@ -5,6 +5,7 @@
#![warn(clippy::manual_assert)]
#![allow(clippy::nonminimal_bool)]
+#![allow(dead_code)]
macro_rules! one {
() => {
@@ -66,3 +67,15 @@ fn main() {
panic!("with expansion {}", one!())
}
}
+
+fn issue7730() {
+ // Suggestion should preserve comment
+ if true {
+ // comment
+ /* this is a
+ multiline
+ comment */
+ /// Doc comment
+ panic!("panic with comment") // comment after `panic!`
+ }
+}
From a35734c172ba95a6d8758c7c5bb6601bcd3a5485 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Fri, 16 Sep 2022 21:38:56 +0200
Subject: [PATCH 2/4] revert `manual_assert` suggestion refactor
Because `Sugg` helper does not simplify multiple negations
---
clippy_lints/src/manual_assert.rs | 11 +++++++----
tests/ui/manual_assert.edition2018.fixed | 4 ++--
tests/ui/manual_assert.edition2018.stderr | 4 ++--
tests/ui/manual_assert.edition2021.fixed | 4 ++--
tests/ui/manual_assert.edition2021.stderr | 4 ++--
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/clippy_lints/src/manual_assert.rs b/clippy_lints/src/manual_assert.rs
index 9934c06e723..cbc9c4ca6ad 100644
--- a/clippy_lints/src/manual_assert.rs
+++ b/clippy_lints/src/manual_assert.rs
@@ -4,7 +4,7 @@ use clippy_utils::macros::{root_macro_call, FormatArgsExpn};
use clippy_utils::source::snippet_with_applicability;
use clippy_utils::{peel_blocks_with_stmt, span_extract_comment, sugg};
use rustc_errors::Applicability;
-use rustc_hir::{Expr, ExprKind};
+use rustc_hir::{Expr, ExprKind, UnOp};
use rustc_lint::{LateContext, LateLintPass};
use rustc_session::{declare_lint_pass, declare_tool_lint};
use rustc_span::sym;
@@ -55,9 +55,12 @@ impl<'tcx> LateLintPass<'tcx> for ManualAssert {
if !comments.is_empty() {
comments += "\n";
}
- // we need to negate the <cond> expression because `assert!` panics when <cond> is `false`, wherease original pattern panicked when evaluating to `true`
- let cond_sugg = !sugg::Sugg::hir_with_applicability(cx, cond, "..", &mut applicability);
- let sugg = format!("assert!({cond_sugg}, {format_args_snip});");
+ let (cond, not) = match cond.kind {
+ ExprKind::Unary(UnOp::Not, e) => (e, ""),
+ _ => (cond, "!"),
+ };
+ let cond_sugg = sugg::Sugg::hir_with_applicability(cx, cond, "..", &mut applicability).maybe_par();
+ let sugg = format!("assert!({not}{cond_sugg}, {format_args_snip});");
// we show to the user the suggestion without the comments, but when applicating the fix, include the comments in the block
span_lint_and_then(
cx,
diff --git a/tests/ui/manual_assert.edition2018.fixed b/tests/ui/manual_assert.edition2018.fixed
index b5ccc07e49e..81e38e1bf79 100644
--- a/tests/ui/manual_assert.edition2018.fixed
+++ b/tests/ui/manual_assert.edition2018.fixed
@@ -28,8 +28,8 @@ fn main() {
{
panic!("qaqaq{:?}", a);
}
- assert!(!(!a.is_empty()), "qaqaq{:?}", a);
- assert!(!(!a.is_empty()), "qwqwq");
+ assert!(a.is_empty(), "qaqaq{:?}", a);
+ assert!(a.is_empty(), "qwqwq");
if a.len() == 3 {
println!("qwq");
println!("qwq");
diff --git a/tests/ui/manual_assert.edition2018.stderr b/tests/ui/manual_assert.edition2018.stderr
index df22e0114be..e71bf428382 100644
--- a/tests/ui/manual_assert.edition2018.stderr
+++ b/tests/ui/manual_assert.edition2018.stderr
@@ -9,7 +9,7 @@ LL | | }
= note: `-D clippy::manual-assert` implied by `-D warnings`
help: try instead
|
-LL | assert!(!(!a.is_empty()), "qaqaq{:?}", a);
+LL | assert!(a.is_empty(), "qaqaq{:?}", a);
|
error: only a `panic!` in `if`-then statement
@@ -22,7 +22,7 @@ LL | | }
|
help: try instead
|
-LL | assert!(!(!a.is_empty()), "qwqwq");
+LL | assert!(a.is_empty(), "qwqwq");
|
error: only a `panic!` in `if`-then statement
diff --git a/tests/ui/manual_assert.edition2021.fixed b/tests/ui/manual_assert.edition2021.fixed
index b5ccc07e49e..81e38e1bf79 100644
--- a/tests/ui/manual_assert.edition2021.fixed
+++ b/tests/ui/manual_assert.edition2021.fixed
@@ -28,8 +28,8 @@ fn main() {
{
panic!("qaqaq{:?}", a);
}
- assert!(!(!a.is_empty()), "qaqaq{:?}", a);
- assert!(!(!a.is_empty()), "qwqwq");
+ assert!(a.is_empty(), "qaqaq{:?}", a);
+ assert!(a.is_empty(), "qwqwq");
if a.len() == 3 {
println!("qwq");
println!("qwq");
diff --git a/tests/ui/manual_assert.edition2021.stderr b/tests/ui/manual_assert.edition2021.stderr
index df22e0114be..e71bf428382 100644
--- a/tests/ui/manual_assert.edition2021.stderr
+++ b/tests/ui/manual_assert.edition2021.stderr
@@ -9,7 +9,7 @@ LL | | }
= note: `-D clippy::manual-assert` implied by `-D warnings`
help: try instead
|
-LL | assert!(!(!a.is_empty()), "qaqaq{:?}", a);
+LL | assert!(a.is_empty(), "qaqaq{:?}", a);
|
error: only a `panic!` in `if`-then statement
@@ -22,7 +22,7 @@ LL | | }
|
help: try instead
|
-LL | assert!(!(!a.is_empty()), "qwqwq");
+LL | assert!(a.is_empty(), "qwqwq");
|
error: only a `panic!` in `if`-then statement
From 22be60b4f07bcfc8e72976b4d9f2cd1f9cae29d5 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Sun, 2 Oct 2022 12:35:02 +0200
Subject: [PATCH 3/4] fix indentation
---
clippy_lints/src/manual_assert.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/clippy_lints/src/manual_assert.rs b/clippy_lints/src/manual_assert.rs
index cbc9c4ca6ad..825ec84b4a8 100644
--- a/clippy_lints/src/manual_assert.rs
+++ b/clippy_lints/src/manual_assert.rs
@@ -56,9 +56,9 @@ impl<'tcx> LateLintPass<'tcx> for ManualAssert {
comments += "\n";
}
let (cond, not) = match cond.kind {
- ExprKind::Unary(UnOp::Not, e) => (e, ""),
- _ => (cond, "!"),
- };
+ ExprKind::Unary(UnOp::Not, e) => (e, ""),
+ _ => (cond, "!"),
+ };
let cond_sugg = sugg::Sugg::hir_with_applicability(cx, cond, "..", &mut applicability).maybe_par();
let sugg = format!("assert!({not}{cond_sugg}, {format_args_snip});");
// we show to the user the suggestion without the comments, but when applicating the fix, include the comments in the block
From 3ab02aa3596567292406fb6e44e650dedcb25297 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Sun, 2 Oct 2022 15:25:50 +0200
Subject: [PATCH 4/4] fix tests
---
tests/ui/manual_assert.edition2018.fixed | 7 +++----
tests/ui/manual_assert.edition2018.stderr | 22 +++++++++++-----------
tests/ui/manual_assert.edition2021.fixed | 7 +++----
tests/ui/manual_assert.edition2021.stderr | 22 +++++++++++-----------
tests/ui/manual_assert.rs | 7 +++----
5 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/tests/ui/manual_assert.edition2018.fixed b/tests/ui/manual_assert.edition2018.fixed
index 81e38e1bf79..84f6855f338 100644
--- a/tests/ui/manual_assert.edition2018.fixed
+++ b/tests/ui/manual_assert.edition2018.fixed
@@ -4,8 +4,7 @@
// run-rustfix
#![warn(clippy::manual_assert)]
-#![allow(clippy::nonminimal_bool)]
-#![allow(dead_code)]
+#![allow(dead_code, unused_doc_comments, clippy::nonminimal_bool)]
macro_rules! one {
() => {
@@ -52,7 +51,7 @@ fn main() {
assert!(!a.is_empty(), "with expansion {}", one!());
}
-fn issue7730() {
+fn issue7730(a: u8) {
// Suggestion should preserve comment
// comment
/* this is a
@@ -60,5 +59,5 @@ fn issue7730() {
comment */
/// Doc comment
// comment after `panic!`
-assert!(!true, "panic with comment");
+assert!(!(a > 2), "panic with comment");
}
diff --git a/tests/ui/manual_assert.edition2018.stderr b/tests/ui/manual_assert.edition2018.stderr
index e71bf428382..dbd21be2da9 100644
--- a/tests/ui/manual_assert.edition2018.stderr
+++ b/tests/ui/manual_assert.edition2018.stderr
@@ -1,5 +1,5 @@
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:31:5
+ --> $DIR/manual_assert.rs:30:5
|
LL | / if !a.is_empty() {
LL | | panic!("qaqaq{:?}", a);
@@ -13,7 +13,7 @@ LL | assert!(a.is_empty(), "qaqaq{:?}", a);
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:34:5
+ --> $DIR/manual_assert.rs:33:5
|
LL | / if !a.is_empty() {
LL | | panic!("qwqwq");
@@ -26,7 +26,7 @@ LL | assert!(a.is_empty(), "qwqwq");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:51:5
+ --> $DIR/manual_assert.rs:50:5
|
LL | / if b.is_empty() {
LL | | panic!("panic1");
@@ -39,7 +39,7 @@ LL | assert!(!b.is_empty(), "panic1");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:54:5
+ --> $DIR/manual_assert.rs:53:5
|
LL | / if b.is_empty() && a.is_empty() {
LL | | panic!("panic2");
@@ -52,7 +52,7 @@ LL | assert!(!(b.is_empty() && a.is_empty()), "panic2");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:57:5
+ --> $DIR/manual_assert.rs:56:5
|
LL | / if a.is_empty() && !b.is_empty() {
LL | | panic!("panic3");
@@ -65,7 +65,7 @@ LL | assert!(!(a.is_empty() && !b.is_empty()), "panic3");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:60:5
+ --> $DIR/manual_assert.rs:59:5
|
LL | / if b.is_empty() || a.is_empty() {
LL | | panic!("panic4");
@@ -78,7 +78,7 @@ LL | assert!(!(b.is_empty() || a.is_empty()), "panic4");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:63:5
+ --> $DIR/manual_assert.rs:62:5
|
LL | / if a.is_empty() || !b.is_empty() {
LL | | panic!("panic5");
@@ -91,7 +91,7 @@ LL | assert!(!(a.is_empty() || !b.is_empty()), "panic5");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:66:5
+ --> $DIR/manual_assert.rs:65:5
|
LL | / if a.is_empty() {
LL | | panic!("with expansion {}", one!())
@@ -104,9 +104,9 @@ LL | assert!(!a.is_empty(), "with expansion {}", one!());
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:73:5
+ --> $DIR/manual_assert.rs:72:5
|
-LL | / if true {
+LL | / if a > 2 {
LL | | // comment
LL | | /* this is a
LL | | multiline
@@ -117,7 +117,7 @@ LL | | }
|
help: try instead
|
-LL | assert!(!true, "panic with comment");
+LL | assert!(!(a > 2), "panic with comment");
|
error: aborting due to 9 previous errors
diff --git a/tests/ui/manual_assert.edition2021.fixed b/tests/ui/manual_assert.edition2021.fixed
index 81e38e1bf79..84f6855f338 100644
--- a/tests/ui/manual_assert.edition2021.fixed
+++ b/tests/ui/manual_assert.edition2021.fixed
@@ -4,8 +4,7 @@
// run-rustfix
#![warn(clippy::manual_assert)]
-#![allow(clippy::nonminimal_bool)]
-#![allow(dead_code)]
+#![allow(dead_code, unused_doc_comments, clippy::nonminimal_bool)]
macro_rules! one {
() => {
@@ -52,7 +51,7 @@ fn main() {
assert!(!a.is_empty(), "with expansion {}", one!());
}
-fn issue7730() {
+fn issue7730(a: u8) {
// Suggestion should preserve comment
// comment
/* this is a
@@ -60,5 +59,5 @@ fn issue7730() {
comment */
/// Doc comment
// comment after `panic!`
-assert!(!true, "panic with comment");
+assert!(!(a > 2), "panic with comment");
}
diff --git a/tests/ui/manual_assert.edition2021.stderr b/tests/ui/manual_assert.edition2021.stderr
index e71bf428382..dbd21be2da9 100644
--- a/tests/ui/manual_assert.edition2021.stderr
+++ b/tests/ui/manual_assert.edition2021.stderr
@@ -1,5 +1,5 @@
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:31:5
+ --> $DIR/manual_assert.rs:30:5
|
LL | / if !a.is_empty() {
LL | | panic!("qaqaq{:?}", a);
@@ -13,7 +13,7 @@ LL | assert!(a.is_empty(), "qaqaq{:?}", a);
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:34:5
+ --> $DIR/manual_assert.rs:33:5
|
LL | / if !a.is_empty() {
LL | | panic!("qwqwq");
@@ -26,7 +26,7 @@ LL | assert!(a.is_empty(), "qwqwq");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:51:5
+ --> $DIR/manual_assert.rs:50:5
|
LL | / if b.is_empty() {
LL | | panic!("panic1");
@@ -39,7 +39,7 @@ LL | assert!(!b.is_empty(), "panic1");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:54:5
+ --> $DIR/manual_assert.rs:53:5
|
LL | / if b.is_empty() && a.is_empty() {
LL | | panic!("panic2");
@@ -52,7 +52,7 @@ LL | assert!(!(b.is_empty() && a.is_empty()), "panic2");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:57:5
+ --> $DIR/manual_assert.rs:56:5
|
LL | / if a.is_empty() && !b.is_empty() {
LL | | panic!("panic3");
@@ -65,7 +65,7 @@ LL | assert!(!(a.is_empty() && !b.is_empty()), "panic3");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:60:5
+ --> $DIR/manual_assert.rs:59:5
|
LL | / if b.is_empty() || a.is_empty() {
LL | | panic!("panic4");
@@ -78,7 +78,7 @@ LL | assert!(!(b.is_empty() || a.is_empty()), "panic4");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:63:5
+ --> $DIR/manual_assert.rs:62:5
|
LL | / if a.is_empty() || !b.is_empty() {
LL | | panic!("panic5");
@@ -91,7 +91,7 @@ LL | assert!(!(a.is_empty() || !b.is_empty()), "panic5");
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:66:5
+ --> $DIR/manual_assert.rs:65:5
|
LL | / if a.is_empty() {
LL | | panic!("with expansion {}", one!())
@@ -104,9 +104,9 @@ LL | assert!(!a.is_empty(), "with expansion {}", one!());
|
error: only a `panic!` in `if`-then statement
- --> $DIR/manual_assert.rs:73:5
+ --> $DIR/manual_assert.rs:72:5
|
-LL | / if true {
+LL | / if a > 2 {
LL | | // comment
LL | | /* this is a
LL | | multiline
@@ -117,7 +117,7 @@ LL | | }
|
help: try instead
|
-LL | assert!(!true, "panic with comment");
+LL | assert!(!(a > 2), "panic with comment");
|
error: aborting due to 9 previous errors
diff --git a/tests/ui/manual_assert.rs b/tests/ui/manual_assert.rs
index e9dd81a758a..14abf94965a 100644
--- a/tests/ui/manual_assert.rs
+++ b/tests/ui/manual_assert.rs
@@ -4,8 +4,7 @@
// run-rustfix
#![warn(clippy::manual_assert)]
-#![allow(clippy::nonminimal_bool)]
-#![allow(dead_code)]
+#![allow(dead_code, unused_doc_comments, clippy::nonminimal_bool)]
macro_rules! one {
() => {
@@ -68,9 +67,9 @@ fn main() {
}
}
-fn issue7730() {
+fn issue7730(a: u8) {
// Suggestion should preserve comment
- if true {
+ if a > 2 {
// comment
/* this is a
multiline