Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 15:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Split match_single_binding tests in 2 files (too many lines for CI)

Browse source
This commit is contained in:
ThibsG 2021-03-20 16:31:39 +01:00
parent 00a2d7ad7e
commit 7d45d8a29a
6 changed files with 109 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
tests/ui/match_single_binding.fixed
View file

@ -115,33 +115,4 @@ fn main() {
// =>
_ => println!("Not an array index start"),
}
// Lint (additional curly braces needed, see #6572)
struct AppendIter<I>
where
I: Iterator,
{
inner: Option<(I, <I as Iterator>::Item)>,
}
#[allow(dead_code)]
fn size_hint<I: Iterator>(iter: &AppendIter<I>) -> (usize, Option<usize>) {
match &iter.inner {
Some((iter, _item)) => {
let (min, max) = iter.size_hint();
(min.saturating_add(1), max.and_then(|max| max.checked_add(1)))
},
None => (0, Some(0)),
}
}
// Lint (no additional curly braces needed)
let opt = Some((5, 2));
let get_tup = || -> (i32, i32) { (1, 2) };
match opt {
#[rustfmt::skip]
Some((first, _second)) => {
let (a, b) = get_tup();
println!("a {:?} and b {:?}", a, b);
},
None => println!("nothing"),
}
}

29
tests/ui/match_single_binding.rs
View file

@ -132,33 +132,4 @@ fn main() {
// =>
_ => println!("Not an array index start"),
}
// Lint (additional curly braces needed, see #6572)
struct AppendIter<I>
where
I: Iterator,
{
inner: Option<(I, <I as Iterator>::Item)>,
}
#[allow(dead_code)]
fn size_hint<I: Iterator>(iter: &AppendIter<I>) -> (usize, Option<usize>) {
match &iter.inner {
Some((iter, _item)) => match iter.size_hint() {
(min, max) => (min.saturating_add(1), max.and_then(|max| max.checked_add(1))),
},
None => (0, Some(0)),
}
}
// Lint (no additional curly braces needed)
let opt = Some((5, 2));
let get_tup = || -> (i32, i32) { (1, 2) };
match opt {
#[rustfmt::skip]
Some((first, _second)) => {
match get_tup() {
(a, b) => println!("a {:?} and b {:?}", a, b),
}
},
None => println!("nothing"),
}
}

33
tests/ui/match_single_binding.stderr
View file

@ -178,36 +178,5 @@ LL | | _ => println!("Single branch"),
LL | | }
| |_____^ help: consider using the match body instead: `println!("Single branch");`
error: this match could be written as a `let` statement
--> $DIR/match_single_binding.rs:146:36
|
LL | Some((iter, _item)) => match iter.size_hint() {
| ____________________________________^
LL | | (min, max) => (min.saturating_add(1), max.and_then(|max| max.checked_add(1))),
LL | | },
| |_____________^
|
help: consider using `let` statement
|
LL | Some((iter, _item)) => {
LL | let (min, max) = iter.size_hint();
LL | (min.saturating_add(1), max.and_then(|max| max.checked_add(1)))
LL | },
|
error: this match could be written as a `let` statement
--> $DIR/match_single_binding.rs:158:13
|
LL | / match get_tup() {
LL | | (a, b) => println!("a {:?} and b {:?}", a, b),
LL | | }
| |_____________^
|
help: consider using `let` statement
|
LL | let (a, b) = get_tup();
LL | println!("a {:?} and b {:?}", a, b);
|
error: aborting due to 14 previous errors
error: aborting due to 12 previous errors

37
tests/ui/match_single_binding2.fixed Normal file
View file

@ -0,0 +1,37 @@
// run-rustfix
#![warn(clippy::match_single_binding)]
#![allow(unused_variables)]
fn main() {
// Lint (additional curly braces needed, see #6572)
struct AppendIter<I>
where
I: Iterator,
{
inner: Option<(I, <I as Iterator>::Item)>,
}
#[allow(dead_code)]
fn size_hint<I: Iterator>(iter: &AppendIter<I>) -> (usize, Option<usize>) {
match &iter.inner {
Some((iter, _item)) => {
let (min, max) = iter.size_hint();
(min.saturating_add(1), max.and_then(|max| max.checked_add(1)))
},
None => (0, Some(0)),
}
}
// Lint (no additional curly braces needed)
let opt = Some((5, 2));
let get_tup = || -> (i32, i32) { (1, 2) };
match opt {
#[rustfmt::skip]
Some((first, _second)) => {
let (a, b) = get_tup();
println!("a {:?} and b {:?}", a, b);
},
None => println!("nothing"),
}
}

37
tests/ui/match_single_binding2.rs Normal file
View file

@ -0,0 +1,37 @@
// run-rustfix
#![warn(clippy::match_single_binding)]
#![allow(unused_variables)]
fn main() {
// Lint (additional curly braces needed, see #6572)
struct AppendIter<I>
where
I: Iterator,
{
inner: Option<(I, <I as Iterator>::Item)>,
}
#[allow(dead_code)]
fn size_hint<I: Iterator>(iter: &AppendIter<I>) -> (usize, Option<usize>) {
match &iter.inner {
Some((iter, _item)) => match iter.size_hint() {
(min, max) => (min.saturating_add(1), max.and_then(|max| max.checked_add(1))),
},
None => (0, Some(0)),
}
}
// Lint (no additional curly braces needed)
let opt = Some((5, 2));
let get_tup = || -> (i32, i32) { (1, 2) };
match opt {
#[rustfmt::skip]
Some((first, _second)) => {
match get_tup() {
(a, b) => println!("a {:?} and b {:?}", a, b),
}
},
None => println!("nothing"),
}
}

34
tests/ui/match_single_binding2.stderr Normal file
View file

@ -0,0 +1,34 @@
error: this match could be written as a `let` statement
--> $DIR/match_single_binding2.rs:18:36
|
LL | Some((iter, _item)) => match iter.size_hint() {
| ____________________________________^
LL | | (min, max) => (min.saturating_add(1), max.and_then(|max| max.checked_add(1))),
LL | | },
| |_____________^
|
= note: `-D clippy::match-single-binding` implied by `-D warnings`
help: consider using `let` statement
|
LL | Some((iter, _item)) => {
LL | let (min, max) = iter.size_hint();
LL | (min.saturating_add(1), max.and_then(|max| max.checked_add(1)))
LL | },
|
error: this match could be written as a `let` statement
--> $DIR/match_single_binding2.rs:31:13
|
LL | / match get_tup() {
LL | | (a, b) => println!("a {:?} and b {:?}", a, b),
LL | | }
| |_____________^
|
help: consider using `let` statement
|
LL | let (a, b) = get_tup();
LL | println!("a {:?} and b {:?}", a, b);
|
error: aborting due to 2 previous errors