improve tests

Author: y21

tests/ui/useless_conversion.fixed

@@ -194,13 +194,24 @@ mod issue11300 {
         assert_eq!(i.len(), 3);
     }
 
-    trait Helper {}
-    impl Helper for [i32; 3] {}
-    impl Helper for std::array::IntoIter<i32, 3> {}
+    trait Helper<T: ?Sized> {}
+    impl Helper<i32> for [i32; 3] {}
+    impl Helper<i32> for std::array::IntoIter<i32, 3> {}
+    impl Helper<()> for std::array::IntoIter<i32, 3> {}
 
-    fn foo2<I>(_: I)
+    fn foo2<X: ?Sized, I>(_: I)
     where
-        I: IntoIterator<Item = i32> + Helper,
+        I: IntoIterator<Item = i32> + Helper<X>,
+    {
+    }
+
+    trait Helper2<T> {}
+    impl Helper2<std::array::IntoIter<i32, 3>> for i32 {}
+    impl Helper2<[i32; 3]> for i32 {}
+    fn foo3<I>(_: I)
+    where
+        I: IntoIterator<Item = i32>,
+        i32: Helper2<I>,
     {
     }
 
@@ -211,7 +222,15 @@ mod issue11300 {
         foo([1, 2, 3].into_iter());
 
         // This should trigger the lint, receiver type [i32; 3] also implements `Helper`
-        foo2([1, 2, 3]);
+        foo2::<i32, _>([1, 2, 3]);
+
+        // This again should *not* lint, since X = () and I = std::array::IntoIter<i32, 3>,
+        // and `[i32; 3]: Helper<()>` is not true (only `std::array::IntoIter<i32, 3>: Helper<()>` is).
+        foo2::<(), _>([1, 2, 3].into_iter());
+
+        // This should lint. Removing the `.into_iter()` means that `I` gets substituted with `[i32; 3]`,
+        // and `i32: Helper2<[i32, 3]>` is true, so this call is indeed unncessary.
+        foo3([1, 2, 3]);
     }
 }
 

tests/ui/useless_conversion.rs

@@ -194,13 +194,24 @@ mod issue11300 {
         assert_eq!(i.len(), 3);
     }
 
-    trait Helper {}
-    impl Helper for [i32; 3] {}
-    impl Helper for std::array::IntoIter<i32, 3> {}
+    trait Helper<T: ?Sized> {}
+    impl Helper<i32> for [i32; 3] {}
+    impl Helper<i32> for std::array::IntoIter<i32, 3> {}
+    impl Helper<()> for std::array::IntoIter<i32, 3> {}
 
-    fn foo2<I>(_: I)
+    fn foo2<X: ?Sized, I>(_: I)
     where
-        I: IntoIterator<Item = i32> + Helper,
+        I: IntoIterator<Item = i32> + Helper<X>,
+    {
+    }
+
+    trait Helper2<T> {}
+    impl Helper2<std::array::IntoIter<i32, 3>> for i32 {}
+    impl Helper2<[i32; 3]> for i32 {}
+    fn foo3<I>(_: I)
+    where
+        I: IntoIterator<Item = i32>,
+        i32: Helper2<I>,
     {
     }
 
@@ -211,7 +222,15 @@ mod issue11300 {
         foo([1, 2, 3].into_iter());
 
         // This should trigger the lint, receiver type [i32; 3] also implements `Helper`
-        foo2([1, 2, 3].into_iter());
+        foo2::<i32, _>([1, 2, 3].into_iter());
+
+        // This again should *not* lint, since X = () and I = std::array::IntoIter<i32, 3>,
+        // and `[i32; 3]: Helper<()>` is not true (only `std::array::IntoIter<i32, 3>: Helper<()>` is).
+        foo2::<(), _>([1, 2, 3].into_iter());
+
+        // This should lint. Removing the `.into_iter()` means that `I` gets substituted with `[i32; 3]`,
+        // and `i32: Helper2<[i32, 3]>` is true, so this call is indeed unncessary.
+        foo3([1, 2, 3].into_iter());
     }
 }
 

tests/ui/useless_conversion.stderr

@@ -179,16 +179,28 @@ LL |     fn b<T: IntoIterator<Item = i32>>(_: T) {}
    |             ^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: explicit call to `.into_iter()` in function argument accepting `IntoIterator`
-  --> $DIR/useless_conversion.rs:214:14
+  --> $DIR/useless_conversion.rs:225:24
    |
-LL |         foo2([1, 2, 3].into_iter());
+LL |         foo2::<i32, _>([1, 2, 3].into_iter());
+   |                        ^^^^^^^^^^^^^^^^^^^^^ help: consider removing the `.into_iter()`: `[1, 2, 3]`
+   |
+note: this parameter accepts any `IntoIterator`, so you don't need to call `.into_iter()`
+  --> $DIR/useless_conversion.rs:204:12
+   |
+LL |         I: IntoIterator<Item = i32> + Helper<X>,
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: explicit call to `.into_iter()` in function argument accepting `IntoIterator`
+  --> $DIR/useless_conversion.rs:233:14
+   |
+LL |         foo3([1, 2, 3].into_iter());
    |              ^^^^^^^^^^^^^^^^^^^^^ help: consider removing the `.into_iter()`: `[1, 2, 3]`
    |
 note: this parameter accepts any `IntoIterator`, so you don't need to call `.into_iter()`
-  --> $DIR/useless_conversion.rs:203:12
+  --> $DIR/useless_conversion.rs:213:12
    |
-LL |         I: IntoIterator<Item = i32> + Helper,
+LL |         I: IntoIterator<Item = i32>,
    |            ^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 25 previous errors
+error: aborting due to 26 previous errors