Formatted the ui tests

Author: theo-lw

tests/ui/map_identity.fixed

@@ -5,12 +5,17 @@
 fn main() {
     let x: [u16; 3] = [1, 2, 3];
     // should lint
-    let _: Vec<_> = x.iter().collect();
+    let _: Vec<_> = x.iter().map(not_identity).collect();
     let _: Vec<_> = x.iter().collect();
     let _: Option<u8> = Some(3);
+    let _: Result<i8, f32> = Ok(-3);
     // should not lint
-    let _: Vec<_> = x.iter().map(|x| 2*x).collect();
-    let _: Vec<_> = x.iter().map(not_identity).collect();
+    let _: Vec<_> = x.iter().map(|x| 2 * x).collect();
+    let _: Vec<_> = x.iter().map(not_identity).map(|x| return x - 4).collect();
+    let _: Option<u8> = None.map(|x: u8| x - 1);
+    let _: Result<i8, f32> = Err(2.3).map(|x: i8| {
+        return x + 3;
+    });
 }
 
 #[allow(dead_code)]

tests/ui/map_identity.rs

@@ -5,12 +5,19 @@
 fn main() {
     let x: [u16; 3] = [1, 2, 3];
     // should lint
-    let _: Vec<_> = x.iter().map(|x| { return x }).collect();
-    let _: Vec<_> = x.iter().map(identity).collect();
+    let _: Vec<_> = x.iter().map(not_identity).map(|x| return x).collect();
+    let _: Vec<_> = x.iter().map(identity).map(|y| y).collect();
     let _: Option<u8> = Some(3).map(|x| x);
+    let _: Result<i8, f32> = Ok(-3).map(|x| {
+        return x;
+    });
     // should not lint
-    let _: Vec<_> = x.iter().map(|x| 2*x).collect();
-    let _: Vec<_> = x.iter().map(not_identity).collect();
+    let _: Vec<_> = x.iter().map(|x| 2 * x).collect();
+    let _: Vec<_> = x.iter().map(not_identity).map(|x| return x - 4).collect();
+    let _: Option<u8> = None.map(|x: u8| x - 1);
+    let _: Result<i8, f32> = Err(2.3).map(|x: i8| {
+        return x + 3;
+    });
 }
 
 #[allow(dead_code)]

tests/ui/map_identity.stderr

@@ -1,15 +1,21 @@
 error: unnecessary map of the identity function
   --> $DIR/map_identity.rs:8:29
    |
-LL |     let _: Vec<_> = x.iter().map(|x| { return x }).collect();
-   |                             ^^^^^^^^^^^^^^^^^^^^^^ help: remove the call to `map`
+LL |     let _: Vec<_> = x.iter().map(not_identity).map(|x| return x).collect();
+   |                                               ^^^^^^^^^^^^^^^^^^ help: remove the call to `map`
    |
    = note: `-D clippy::map-identity` implied by `-D warnings`
 
+error: unnecessary map of the identity function
+  --> $DIR/map_identity.rs:9:43
+   |
+LL |     let _: Vec<_> = x.iter().map(identity).map(|y| y).collect();
+   |                                           ^^^^^^^^^^^ help: remove the call to `map`
+
 error: unnecessary map of the identity function
   --> $DIR/map_identity.rs:9:29
    |
-LL |     let _: Vec<_> = x.iter().map(identity).collect();
+LL |     let _: Vec<_> = x.iter().map(identity).map(|y| y).collect();
    |                             ^^^^^^^^^^^^^^ help: remove the call to `map`
 
 error: unnecessary map of the identity function
@@ -18,5 +24,14 @@ error: unnecessary map of the identity function
 LL |     let _: Option<u8> = Some(3).map(|x| x);
    |                                ^^^^^^^^^^^ help: remove the call to `map`
 
-error: aborting due to 3 previous errors
+error: unnecessary map of the identity function
+  --> $DIR/map_identity.rs:11:36
+   |
+LL |       let _: Result<i8, f32> = Ok(-3).map(|x| {
+   |  ____________________________________^
+LL | |         return x;
+LL | |     });
+   | |______^ help: remove the call to `map`
+
+error: aborting due to 5 previous errors