Fix numeric-cast tests for new `into` suggestion

Remove `integer-into.rs` since the numeric-cast tests already cover
these cases.

5 files changed, 43 insertions, 123 deletions

diff --git a/src/test/ui/numeric/numeric-cast-2.stderr b/src/test/ui/numeric/numeric-cast-2.stderr
index 465b507b788..3f900062cbb 100644
--- a/src/test/ui/numeric/numeric-cast-2.stderr
+++ b/src/test/ui/numeric/numeric-cast-2.stderr
@@ -15,27 +15,21 @@ error[E0308]: mismatched types
   --> $DIR/numeric-cast-2.rs:7:18
    |
 LL |     let y: i64 = x + x;
-   |            ---   ^^^^^ expected `i64`, found `u16`
-   |            |
+   |            ---   ^^^^^
+   |            |     |
+   |            |     expected `i64`, found `u16`
+   |            |     help: you can convert an `u16` to `i64`: `(x + x).into()`
    |            expected due to this
-   |
-help: you can convert an `u16` to `i64` and panic if the converted value wouldn't fit
-   |
-LL |     let y: i64 = (x + x).try_into().unwrap();
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0308]: mismatched types
   --> $DIR/numeric-cast-2.rs:9:18
    |
 LL |     let z: i32 = x + x;
-   |            ---   ^^^^^ expected `i32`, found `u16`
-   |            |
+   |            ---   ^^^^^
+   |            |     |
+   |            |     expected `i32`, found `u16`
+   |            |     help: you can convert an `u16` to `i32`: `(x + x).into()`
    |            expected due to this
-   |
-help: you can convert an `u16` to `i32` and panic if the converted value wouldn't fit
-   |
-LL |     let z: i32 = (x + x).try_into().unwrap();
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/numeric/numeric-cast.fixed b/src/test/ui/numeric/numeric-cast.fixed
index 31acdb8faf6..cf0560a1077 100644
--- a/src/test/ui/numeric/numeric-cast.fixed
+++ b/src/test/ui/numeric/numeric-cast.fixed
@@ -49,7 +49,7 @@ fn main() {
     //~^ ERROR mismatched types
     foo::<isize>(x_u16.try_into().unwrap());
     //~^ ERROR mismatched types
-    foo::<isize>(x_u8.try_into().unwrap());
+    foo::<isize>(x_u8.into());
     //~^ ERROR mismatched types
     foo::<isize>(x_isize);
     foo::<isize>(x_i64.try_into().unwrap());
@@ -89,11 +89,11 @@ fn main() {
     //~^ ERROR mismatched types
     foo::<i64>(x_u64.try_into().unwrap());
     //~^ ERROR mismatched types
-    foo::<i64>(x_u32.try_into().unwrap());
+    foo::<i64>(x_u32.into());
     //~^ ERROR mismatched types
-    foo::<i64>(x_u16.try_into().unwrap());
+    foo::<i64>(x_u16.into());
     //~^ ERROR mismatched types
-    foo::<i64>(x_u8.try_into().unwrap());
+    foo::<i64>(x_u8.into());
     //~^ ERROR mismatched types
     foo::<i64>(x_isize.try_into().unwrap());
     //~^ ERROR mismatched types
@@ -135,9 +135,9 @@ fn main() {
     //~^ ERROR mismatched types
     foo::<i32>(x_u32.try_into().unwrap());
     //~^ ERROR mismatched types
-    foo::<i32>(x_u16.try_into().unwrap());
+    foo::<i32>(x_u16.into());
     //~^ ERROR mismatched types
-    foo::<i32>(x_u8.try_into().unwrap());
+    foo::<i32>(x_u8.into());
     //~^ ERROR mismatched types
     foo::<i32>(x_isize.try_into().unwrap());
     //~^ ERROR mismatched types
@@ -181,7 +181,7 @@ fn main() {
     //~^ ERROR mismatched types
     foo::<i16>(x_u16.try_into().unwrap());
     //~^ ERROR mismatched types
-    foo::<i16>(x_u8.try_into().unwrap());
+    foo::<i16>(x_u8.into());
     //~^ ERROR mismatched types
     foo::<i16>(x_isize.try_into().unwrap());
     //~^ ERROR mismatched types
diff --git a/src/test/ui/numeric/numeric-cast.stderr b/src/test/ui/numeric/numeric-cast.stderr
index ff92a86c3a7..cc1aa72d214 100644
--- a/src/test/ui/numeric/numeric-cast.stderr
+++ b/src/test/ui/numeric/numeric-cast.stderr
@@ -141,12 +141,10 @@ error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:52:18
    |
 LL |     foo::<isize>(x_u8);
-   |                  ^^^^ expected `isize`, found `u8`
-   |
-help: you can convert an `u8` to `isize` and panic if the converted value wouldn't fit
-   |
-LL |     foo::<isize>(x_u8.try_into().unwrap());
-   |                  ^^^^^^^^^^^^^^^^^^^^^^^^
+   |                  ^^^^
+   |                  |
+   |                  expected `isize`, found `u8`
+   |                  help: you can convert an `u8` to `isize`: `x_u8.into()`
 
 error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:55:18
@@ -307,34 +305,28 @@ error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:92:16
    |
 LL |     foo::<i64>(x_u32);
-   |                ^^^^^ expected `i64`, found `u32`
-   |
-help: you can convert an `u32` to `i64` and panic if the converted value wouldn't fit
-   |
-LL |     foo::<i64>(x_u32.try_into().unwrap());
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                ^^^^^
+   |                |
+   |                expected `i64`, found `u32`
+   |                help: you can convert an `u32` to `i64`: `x_u32.into()`
 
 error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:94:16
    |
 LL |     foo::<i64>(x_u16);
-   |                ^^^^^ expected `i64`, found `u16`
-   |
-help: you can convert an `u16` to `i64` and panic if the converted value wouldn't fit
-   |
-LL |     foo::<i64>(x_u16.try_into().unwrap());
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                ^^^^^
+   |                |
+   |                expected `i64`, found `u16`
+   |                help: you can convert an `u16` to `i64`: `x_u16.into()`
 
 error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:96:16
    |
 LL |     foo::<i64>(x_u8);
-   |                ^^^^ expected `i64`, found `u8`
-   |
-help: you can convert an `u8` to `i64` and panic if the converted value wouldn't fit
-   |
-LL |     foo::<i64>(x_u8.try_into().unwrap());
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^
+   |                ^^^^
+   |                |
+   |                expected `i64`, found `u8`
+   |                help: you can convert an `u8` to `i64`: `x_u8.into()`
 
 error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:98:16
@@ -506,23 +498,19 @@ error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:138:16
    |
 LL |     foo::<i32>(x_u16);
-   |                ^^^^^ expected `i32`, found `u16`
-   |
-help: you can convert an `u16` to `i32` and panic if the converted value wouldn't fit
-   |
-LL |     foo::<i32>(x_u16.try_into().unwrap());
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                ^^^^^
+   |                |
+   |                expected `i32`, found `u16`
+   |                help: you can convert an `u16` to `i32`: `x_u16.into()`
 
 error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:140:16
    |
 LL |     foo::<i32>(x_u8);
-   |                ^^^^ expected `i32`, found `u8`
-   |
-help: you can convert an `u8` to `i32` and panic if the converted value wouldn't fit
-   |
-LL |     foo::<i32>(x_u8.try_into().unwrap());
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^
+   |                ^^^^
+   |                |
+   |                expected `i32`, found `u8`
+   |                help: you can convert an `u8` to `i32`: `x_u8.into()`
 
 error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:142:16
@@ -709,12 +697,10 @@ error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:184:16
    |
 LL |     foo::<i16>(x_u8);
-   |                ^^^^ expected `i16`, found `u8`
-   |
-help: you can convert an `u8` to `i16` and panic if the converted value wouldn't fit
-   |
-LL |     foo::<i16>(x_u8.try_into().unwrap());
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^
+   |                ^^^^
+   |                |
+   |                expected `i16`, found `u8`
+   |                help: you can convert an `u8` to `i16`: `x_u8.into()`
 
 error[E0308]: mismatched types
   --> $DIR/numeric-cast.rs:186:16
diff --git a/src/test/ui/suggestions/integer-into.rs b/src/test/ui/suggestions/integer-into.rs
deleted file mode 100644
index 409b27a4eab..00000000000
--- a/src/test/ui/suggestions/integer-into.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-fn main() {
-    let a = 1u8;
-    let _: i64 = a;
-    //~^ ERROR mismatched types
-
-    let b = 1i8;
-    let _: isize = b;
-    //~^ ERROR mismatched types
-
-    let c = 1u8;
-    let _: isize = c;
-    //~^ ERROR mismatched types
-
-    let d = 1u8;
-    let _: usize = d;
-    //~^ ERROR mismatched types
-}
diff --git a/src/test/ui/suggestions/integer-into.stderr b/src/test/ui/suggestions/integer-into.stderr
deleted file mode 100644
index a15cf81f71f..00000000000
--- a/src/test/ui/suggestions/integer-into.stderr
+++ /dev/null
@@ -1,43 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/integer-into.rs:3:18
-   |
-LL |     let _: i64 = a;
-   |            ---   ^
-   |            |     |
-   |            |     expected `i64`, found `u8`
-   |            |     help: you can convert an `u8` to `i64`: `a.into()`
-   |            expected due to this
-
-error[E0308]: mismatched types
-  --> $DIR/integer-into.rs:7:20
-   |
-LL |     let _: isize = b;
-   |            -----   ^
-   |            |       |
-   |            |       expected `isize`, found `i8`
-   |            |       help: you can convert an `i8` to `isize`: `b.into()`
-   |            expected due to this
-
-error[E0308]: mismatched types
-  --> $DIR/integer-into.rs:11:20
-   |
-LL |     let _: isize = c;
-   |            -----   ^
-   |            |       |
-   |            |       expected `isize`, found `u8`
-   |            |       help: you can convert an `u8` to `isize`: `c.into()`
-   |            expected due to this
-
-error[E0308]: mismatched types
-  --> $DIR/integer-into.rs:15:20
-   |
-LL |     let _: usize = d;
-   |            -----   ^
-   |            |       |
-   |            |       expected `usize`, found `u8`
-   |            |       help: you can convert an `u8` to `usize`: `d.into()`
-   |            expected due to this
-
-error: aborting due to 4 previous errors
-
-For more information about this error, try `rustc --explain E0308`.