diff options
| author | Yuning Zhang <codeworm96@outlook.com> | 2018-12-31 20:43:08 -0500 |
|---|---|---|
| committer | Yuning Zhang <codeworm96@outlook.com> | 2018-12-31 20:43:08 -0500 |
| commit | 710dcbd3818deca8f193a45e321b58af3c24feae (patch) | |
| tree | 0bb5f760a042393b0e4eb583f1b776f3cd196ba7 /src/test/ui/consts/const-integer-bool-ops.rs | |
| parent | 6efaef61899f6551914156f69809aa7d5854399d (diff) | |
| download | rust-710dcbd3818deca8f193a45e321b58af3c24feae.tar.gz rust-710dcbd3818deca8f193a45e321b58af3c24feae.zip | |
Improve type mismatch error messages
Replace "integral variable" with "integer" and replace "floating-point variable" with "floating-point number" to make the message less confusing.
Diffstat (limited to 'src/test/ui/consts/const-integer-bool-ops.rs')
| -rw-r--r-- | src/test/ui/consts/const-integer-bool-ops.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/ui/consts/const-integer-bool-ops.rs b/src/test/ui/consts/const-integer-bool-ops.rs index d557d70a52f..f0d5a558e35 100644 --- a/src/test/ui/consts/const-integer-bool-ops.rs +++ b/src/test/ui/consts/const-integer-bool-ops.rs @@ -1,8 +1,8 @@ const X: usize = 42 && 39; //~^ ERROR mismatched types -//~| expected bool, found integral variable +//~| expected bool, found integer //~| ERROR mismatched types -//~| expected bool, found integral variable +//~| expected bool, found integer //~| ERROR mismatched types //~| expected usize, found bool const ARR: [i32; X] = [99; 34]; @@ -10,9 +10,9 @@ const ARR: [i32; X] = [99; 34]; const X1: usize = 42 || 39; //~^ ERROR mismatched types -//~| expected bool, found integral variable +//~| expected bool, found integer //~| ERROR mismatched types -//~| expected bool, found integral variable +//~| expected bool, found integer //~| ERROR mismatched types //~| expected usize, found bool const ARR1: [i32; X1] = [99; 47]; @@ -20,9 +20,9 @@ const ARR1: [i32; X1] = [99; 47]; const X2: usize = -42 || -39; //~^ ERROR mismatched types -//~| expected bool, found integral variable +//~| expected bool, found integer //~| ERROR mismatched types -//~| expected bool, found integral variable +//~| expected bool, found integer //~| ERROR mismatched types //~| expected usize, found bool const ARR2: [i32; X2] = [99; 18446744073709551607]; @@ -30,9 +30,9 @@ const ARR2: [i32; X2] = [99; 18446744073709551607]; const X3: usize = -42 && -39; //~^ ERROR mismatched types -//~| expected bool, found integral variable +//~| expected bool, found integer //~| ERROR mismatched types -//~| expected bool, found integral variable +//~| expected bool, found integer //~| ERROR mismatched types //~| expected usize, found bool const ARR3: [i32; X3] = [99; 6]; |