From d9721088541ee04f5cdfff2c3627314fc4113df5 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Wed, 15 Jan 2025 18:35:40 +0200 Subject: [PATCH] clippy: uibless new test output --- .../tests/ui/iter_overeager_cloned.fixed | 4 ++-- .../tests/ui/iter_overeager_cloned.stderr | 21 ++++++++++++++++++- src/tools/clippy/tests/ui/op_ref.fixed | 2 +- src/tools/clippy/tests/ui/op_ref.stderr | 10 ++++++++- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/tools/clippy/tests/ui/iter_overeager_cloned.fixed b/src/tools/clippy/tests/ui/iter_overeager_cloned.fixed index d7d3d299349ee..1439da5035b54 100644 --- a/src/tools/clippy/tests/ui/iter_overeager_cloned.fixed +++ b/src/tools/clippy/tests/ui/iter_overeager_cloned.fixed @@ -13,13 +13,13 @@ fn main() { let _: Option = vec.iter().chain(vec.iter()).next().cloned(); - let _: usize = vec.iter().filter(|x| x == &"2").count(); + let _: usize = vec.iter().filter(|x| x == "2").count(); let _: Vec<_> = vec.iter().take(2).cloned().collect(); let _: Vec<_> = vec.iter().skip(2).cloned().collect(); - let _ = vec.iter().filter(|x| x == &"2").nth(2).cloned(); + let _ = vec.iter().filter(|x| x == "2").nth(2).cloned(); let _ = [Some(Some("str".to_string())), Some(Some("str".to_string()))] .iter() diff --git a/src/tools/clippy/tests/ui/iter_overeager_cloned.stderr b/src/tools/clippy/tests/ui/iter_overeager_cloned.stderr index e6680266f1076..6bd03ba1e4424 100644 --- a/src/tools/clippy/tests/ui/iter_overeager_cloned.stderr +++ b/src/tools/clippy/tests/ui/iter_overeager_cloned.stderr @@ -28,6 +28,17 @@ LL | let _: usize = vec.iter().filter(|x| x == &"2").cloned().count(); = note: `-D clippy::redundant-clone` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(clippy::redundant_clone)]` +error: taken reference of right operand + --> tests/ui/iter_overeager_cloned.rs:16:42 + | +LL | let _: usize = vec.iter().filter(|x| x == &"2").cloned().count(); + | ^^^^^---- + | | + | help: use the right value directly: `"2"` + | + = note: `-D clippy::op-ref` implied by `-D warnings` + = help: to override `-D warnings` add `#[allow(clippy::op_ref)]` + error: unnecessarily eager cloning of iterator items --> tests/ui/iter_overeager_cloned.rs:18:21 | @@ -52,6 +63,14 @@ LL | let _ = vec.iter().filter(|x| x == &"2").cloned().nth(2); | | | help: try: `.nth(2).cloned()` +error: taken reference of right operand + --> tests/ui/iter_overeager_cloned.rs:22:35 + | +LL | let _ = vec.iter().filter(|x| x == &"2").cloned().nth(2); + | ^^^^^---- + | | + | help: use the right value directly: `"2"` + error: unnecessarily eager cloning of iterator items --> tests/ui/iter_overeager_cloned.rs:24:13 | @@ -164,5 +183,5 @@ LL | let _ = vec.iter().cloned().any(|x| x.len() == 1); | | | help: try: `.any(|x| x.len() == 1)` -error: aborting due to 19 previous errors +error: aborting due to 21 previous errors diff --git a/src/tools/clippy/tests/ui/op_ref.fixed b/src/tools/clippy/tests/ui/op_ref.fixed index 183dcf4f08635..0079515538d74 100644 --- a/src/tools/clippy/tests/ui/op_ref.fixed +++ b/src/tools/clippy/tests/ui/op_ref.fixed @@ -18,7 +18,7 @@ fn main() { let a = "a".to_string(); let b = "a"; - if b < &a { + if b < a { println!("OK"); } diff --git a/src/tools/clippy/tests/ui/op_ref.stderr b/src/tools/clippy/tests/ui/op_ref.stderr index c5b68730a8f26..ae2f1eaf352dc 100644 --- a/src/tools/clippy/tests/ui/op_ref.stderr +++ b/src/tools/clippy/tests/ui/op_ref.stderr @@ -11,6 +11,14 @@ help: use the values directly LL | let foo = 5 - 6; | ~ ~ +error: taken reference of right operand + --> tests/ui/op_ref.rs:21:8 + | +LL | if b < &a { + | ^^^^-- + | | + | help: use the right value directly: `a` + error: taken reference of right operand --> tests/ui/op_ref.rs:58:13 | @@ -35,5 +43,5 @@ LL | let _ = two + &three; | | | help: use the right value directly: `three` -error: aborting due to 4 previous errors +error: aborting due to 5 previous errors