Skip to content

Commit

Permalink
Fix numeric-cast tests for new into suggestion
Browse files Browse the repository at this point in the history 
Remove `integer-into.rs` since the numeric-cast tests already cover
these cases.
  • Loading branch information
@samrat
samrat committed Apr 28, 2020
1 parent 57dd22b commit a6033e3
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 123 deletions.
22 changes: 8 additions & 14 deletions src/test/ui/numeric/numeric-cast-2.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions src/test/ui/numeric/numeric-cast.fixed
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
70 changes: 28 additions & 42 deletions src/test/ui/numeric/numeric-cast.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
17 changes: 0 additions & 17 deletions src/test/ui/suggestions/integer-into.rs
View file

This file was deleted.

43 changes: 0 additions & 43 deletions src/test/ui/suggestions/integer-into.stderr
View file

This file was deleted.

0 comments on commit a6033e3

Please sign in to comment.