more tests

rust-lang · Dec 24, 2023 · 85e1646 · 85e1646
1 parent 2177f2c
commit 85e1646
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 2 deletions.
diff --git a/tests/ui/iter_filter_is_ok.fixed b/tests/ui/iter_filter_is_ok.fixed
@@ -6,6 +6,10 @@ fn main() {
     let _ = vec![Ok(1), Err(2), Ok(3)].into_iter().flatten();
     //~^ HELP: consider using `flatten` instead
 
+    #[rustfmt::skip]
+    let _ = vec![Ok(1), Err(2)].into_iter().flatten();
+    //~^ HELP: consider using `flatten` instead
+
     // Don't lint below
     let mut counter = 0;
     let _ = vec![Ok(1), Err(2)].into_iter().filter(|o| {

diff --git a/tests/ui/iter_filter_is_ok.rs b/tests/ui/iter_filter_is_ok.rs
@@ -6,6 +6,10 @@ fn main() {
     let _ = vec![Ok(1), Err(2), Ok(3)].into_iter().filter(|a| a.is_ok());
     //~^ HELP: consider using `flatten` instead
 
+    #[rustfmt::skip]
+    let _ = vec![Ok(1), Err(2)].into_iter().filter(|o| { o.is_ok() });
+    //~^ HELP: consider using `flatten` instead
+
     // Don't lint below
     let mut counter = 0;
     let _ = vec![Ok(1), Err(2)].into_iter().filter(|o| {

diff --git a/tests/ui/iter_filter_is_ok.stderr b/tests/ui/iter_filter_is_ok.stderr
@@ -13,5 +13,11 @@ error: `filter` for `is_ok` on iterator over `Result`s
 LL |     let _ = vec![Ok(1), Err(2), Ok(3)].into_iter().filter(|a| a.is_ok());
    |                                                    ^^^^^^^^^^^^^^^^^^^^^ help: consider using `flatten` instead: `flatten()`
 
-error: aborting due to 2 previous errors
+error: `filter` for `is_ok` on iterator over `Result`s
+  --> $DIR/iter_filter_is_ok.rs:10:45
+   |
+LL |     let _ = vec![Ok(1), Err(2)].into_iter().filter(|o| { o.is_ok() });
+   |                                             ^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `flatten` instead: `flatten()`
+
+error: aborting due to 3 previous errors
 
diff --git a/tests/ui/iter_filter_is_some.fixed b/tests/ui/iter_filter_is_some.fixed
@@ -6,12 +6,17 @@ fn main() {
     let _ = vec![Some(1)].into_iter().flatten();
     //~^ HELP: consider using `flatten` instead
 
+    #[rustfmt::skip]
+    let _ = vec![Some(1)].into_iter().flatten();
+    //~^ HELP: consider using `flatten` instead
+
     // Don't lint below
     let mut counter = 0;
     let _ = vec![Some(1)].into_iter().filter(|o| {
         counter += 1;
         o.is_some()
     });
+
     let _ = vec![Some(1)].into_iter().filter(|o| {
         // Roses are red,
         // Violets are blue,

diff --git a/tests/ui/iter_filter_is_some.rs b/tests/ui/iter_filter_is_some.rs
@@ -6,12 +6,17 @@ fn main() {
     let _ = vec![Some(1)].into_iter().filter(|o| o.is_some());
     //~^ HELP: consider using `flatten` instead
 
+    #[rustfmt::skip]
+    let _ = vec![Some(1)].into_iter().filter(|o| { o.is_some() });
+    //~^ HELP: consider using `flatten` instead
+
     // Don't lint below
     let mut counter = 0;
     let _ = vec![Some(1)].into_iter().filter(|o| {
         counter += 1;
         o.is_some()
     });
+
     let _ = vec![Some(1)].into_iter().filter(|o| {
         // Roses are red,
         // Violets are blue,

diff --git a/tests/ui/iter_filter_is_some.stderr b/tests/ui/iter_filter_is_some.stderr
@@ -13,5 +13,11 @@ error: `filter` for `is_some` on iterator over `Option`
 LL |     let _ = vec![Some(1)].into_iter().filter(|o| o.is_some());
    |                                       ^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `flatten` instead: `flatten()`
 
-error: aborting due to 2 previous errors
+error: `filter` for `is_some` on iterator over `Option`
+  --> $DIR/iter_filter_is_some.rs:10:39
+   |
+LL |     let _ = vec![Some(1)].into_iter().filter(|o| { o.is_some() });
+   |                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `flatten` instead: `flatten()`
+
+error: aborting due to 3 previous errors