From 710dcbd3818deca8f193a45e321b58af3c24feae Mon Sep 17 00:00:00 2001 From: Yuning Zhang Date: Mon, 31 Dec 2018 20:43:08 -0500 Subject: [PATCH] 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. --- src/librustc/ty/error.rs | 4 ++-- src/test/ui/bad/bad-const-type.rs | 2 +- src/test/ui/bad/bad-const-type.stderr | 2 +- src/test/ui/binop/binop-logic-int.stderr | 4 ++-- .../ui/blind/blind-item-block-middle.stderr | 2 +- src/test/ui/chalkify/type_inference.stderr | 2 +- src/test/ui/coercion/coerce-to-bang.stderr | 20 ++++++++--------- src/test/ui/consts/const-integer-bool-ops.rs | 16 +++++++------- .../ui/consts/const-integer-bool-ops.stderr | 16 +++++++------- src/test/ui/conversion-methods.stderr | 2 +- ...xpected-float-found-integer-literal.stderr | 10 ++++----- src/test/ui/error-codes/E0070.stderr | 2 +- ...loat-literal-inference-restrictions.stderr | 2 +- .../fully-qualified-type-name1.rs | 2 +- .../fully-qualified-type-name1.stderr | 2 +- .../generic-arg-mismatch-recover.stderr | 2 +- src/test/ui/if/if-let-arm-types.rs | 2 +- src/test/ui/if/if-let-arm-types.stderr | 4 ++-- .../ui/integral-variable-unification-error.rs | 2 +- ...integral-variable-unification-error.stderr | 2 +- src/test/ui/issues/issue-13407.stderr | 2 +- src/test/ui/issues/issue-14091.stderr | 2 +- src/test/ui/issues/issue-19991.rs | 2 +- src/test/ui/issues/issue-19991.stderr | 4 ++-- src/test/ui/issues/issue-33504.stderr | 2 +- src/test/ui/issues/issue-37665.stderr | 2 +- src/test/ui/issues/issue-4201.rs | 2 +- src/test/ui/issues/issue-4201.stderr | 4 ++-- src/test/ui/issues/issue-4968.rs | 2 +- src/test/ui/issues/issue-4968.stderr | 2 +- .../keyword-false-as-identifier.stderr | 2 +- .../keyword/keyword-true-as-identifier.stderr | 2 +- src/test/ui/loops/loop-break-value.stderr | 8 +++---- src/test/ui/match/match-range-fail.stderr | 2 +- src/test/ui/methods/method-self-arg-1.rs | 2 +- src/test/ui/methods/method-self-arg-1.stderr | 2 +- src/test/ui/mir-unpretty.stderr | 2 +- src/test/ui/mismatched_types/E0409.stderr | 2 +- src/test/ui/mismatched_types/abridged.stderr | 4 ++-- .../for-loop-has-unit-body.stderr | 2 +- .../ui/proc-macro/span-preservation.stderr | 2 +- src/test/ui/repeat_count.rs | 2 +- src/test/ui/repeat_count.stderr | 2 +- .../slightly-nice-generic-literal-messages.rs | 2 +- ...ghtly-nice-generic-literal-messages.stderr | 2 +- .../ui/structs/struct-base-wrong-type-2.rs | 2 +- .../structs/struct-base-wrong-type-2.stderr | 2 +- src/test/ui/structs/struct-base-wrong-type.rs | 2 +- .../ui/structs/struct-base-wrong-type.stderr | 2 +- .../structure-constructor-type-mismatch.rs | 12 +++++----- ...structure-constructor-type-mismatch.stderr | 22 +++++++++---------- .../ui/try-block/try-block-type-error.stderr | 2 +- src/test/ui/type/type-mismatch-multiple.rs | 2 +- .../ui/type/type-mismatch-multiple.stderr | 2 +- 54 files changed, 105 insertions(+), 105 deletions(-) diff --git a/src/librustc/ty/error.rs b/src/librustc/ty/error.rs index c491fdd9957e8..6b931e39a05da 100644 --- a/src/librustc/ty/error.rs +++ b/src/librustc/ty/error.rs @@ -200,8 +200,8 @@ impl<'a, 'gcx, 'lcx, 'tcx> ty::TyS<'tcx> { ty::GeneratorWitness(..) => "generator witness".into(), ty::Tuple(..) => "tuple".into(), ty::Infer(ty::TyVar(_)) => "inferred type".into(), - ty::Infer(ty::IntVar(_)) => "integral variable".into(), - ty::Infer(ty::FloatVar(_)) => "floating-point variable".into(), + ty::Infer(ty::IntVar(_)) => "integer".into(), + ty::Infer(ty::FloatVar(_)) => "floating-point number".into(), ty::Placeholder(..) => "placeholder type".into(), ty::Bound(..) => "bound type".into(), ty::Infer(ty::FreshTy(_)) => "fresh type".into(), diff --git a/src/test/ui/bad/bad-const-type.rs b/src/test/ui/bad/bad-const-type.rs index b46f5933010de..8121929e09675 100644 --- a/src/test/ui/bad/bad-const-type.rs +++ b/src/test/ui/bad/bad-const-type.rs @@ -2,5 +2,5 @@ static i: String = 10; //~^ ERROR mismatched types //~| expected type `std::string::String` //~| found type `{integer}` -//~| expected struct `std::string::String`, found integral variable +//~| expected struct `std::string::String`, found integer fn main() { println!("{}", i); } diff --git a/src/test/ui/bad/bad-const-type.stderr b/src/test/ui/bad/bad-const-type.stderr index 694e692a5bec5..677dc72652e92 100644 --- a/src/test/ui/bad/bad-const-type.stderr +++ b/src/test/ui/bad/bad-const-type.stderr @@ -4,7 +4,7 @@ error[E0308]: mismatched types LL | static i: String = 10; | ^^ | | - | expected struct `std::string::String`, found integral variable + | expected struct `std::string::String`, found integer | help: try using a conversion method: `10.to_string()` | = note: expected type `std::string::String` diff --git a/src/test/ui/binop/binop-logic-int.stderr b/src/test/ui/binop/binop-logic-int.stderr index 9ca9e64211c82..b699b390b8bb1 100644 --- a/src/test/ui/binop/binop-logic-int.stderr +++ b/src/test/ui/binop/binop-logic-int.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/binop-logic-int.rs:1:21 | LL | fn main() { let x = 1 && 2; } - | ^ expected bool, found integral variable + | ^ expected bool, found integer | = note: expected type `bool` found type `{integer}` @@ -11,7 +11,7 @@ error[E0308]: mismatched types --> $DIR/binop-logic-int.rs:1:26 | LL | fn main() { let x = 1 && 2; } - | ^ expected bool, found integral variable + | ^ expected bool, found integer | = note: expected type `bool` found type `{integer}` diff --git a/src/test/ui/blind/blind-item-block-middle.stderr b/src/test/ui/blind/blind-item-block-middle.stderr index 05a623404493a..389b63c0adf93 100644 --- a/src/test/ui/blind/blind-item-block-middle.stderr +++ b/src/test/ui/blind/blind-item-block-middle.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/blind-item-block-middle.rs:6:9 | LL | let bar = 5; - | ^^^ expected integral variable, found struct `foo::bar` + | ^^^ expected integer, found struct `foo::bar` | = note: expected type `{integer}` found type `foo::bar` diff --git a/src/test/ui/chalkify/type_inference.stderr b/src/test/ui/chalkify/type_inference.stderr index 49ed97d71680b..d65b701307b43 100644 --- a/src/test/ui/chalkify/type_inference.stderr +++ b/src/test/ui/chalkify/type_inference.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/type_inference.rs:21:14 | LL | only_foo(x); //~ ERROR mismatched types - | ^ expected i32, found floating-point variable + | ^ expected i32, found floating-point number | = note: expected type `i32` found type `{float}` diff --git a/src/test/ui/coercion/coerce-to-bang.stderr b/src/test/ui/coercion/coerce-to-bang.stderr index 0795765ef2d8e..72e7211de7a7f 100644 --- a/src/test/ui/coercion/coerce-to-bang.stderr +++ b/src/test/ui/coercion/coerce-to-bang.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/coerce-to-bang.rs:6:17 | LL | foo(return, 22, 44); - | ^^ expected !, found integral variable + | ^^ expected !, found integer | = note: expected type `!` found type `{integer}` @@ -11,7 +11,7 @@ error[E0308]: mismatched types --> $DIR/coerce-to-bang.rs:18:13 | LL | foo(22, 44, return); //~ ERROR mismatched types - | ^^ expected !, found integral variable + | ^^ expected !, found integer | = note: expected type `!` found type `{integer}` @@ -20,7 +20,7 @@ error[E0308]: mismatched types --> $DIR/coerce-to-bang.rs:26:12 | LL | foo(a, b, c); // ... and hence a reference to `a` is expected to diverge. - | ^ expected !, found integral variable + | ^ expected !, found integer | = note: expected type `!` found type `{integer}` @@ -29,7 +29,7 @@ error[E0308]: mismatched types --> $DIR/coerce-to-bang.rs:36:12 | LL | foo(a, b, c); //~ ERROR mismatched types - | ^ expected !, found integral variable + | ^ expected !, found integer | = note: expected type `!` found type `{integer}` @@ -38,7 +38,7 @@ error[E0308]: mismatched types --> $DIR/coerce-to-bang.rs:45:12 | LL | foo(a, b, c); //~ ERROR mismatched types - | ^ expected !, found integral variable + | ^ expected !, found integer | = note: expected type `!` found type `{integer}` @@ -47,7 +47,7 @@ error[E0308]: mismatched types --> $DIR/coerce-to-bang.rs:50:21 | LL | let x: [!; 2] = [return, 22]; //~ ERROR mismatched types - | ^^^^^^^^^^^^ expected !, found integral variable + | ^^^^^^^^^^^^ expected !, found integer | = note: expected type `[!; 2]` found type `[{integer}; 2]` @@ -56,7 +56,7 @@ error[E0308]: mismatched types --> $DIR/coerce-to-bang.rs:55:22 | LL | let x: [!; 2] = [22, return]; //~ ERROR mismatched types - | ^^ expected !, found integral variable + | ^^ expected !, found integer | = note: expected type `!` found type `{integer}` @@ -65,7 +65,7 @@ error[E0308]: mismatched types --> $DIR/coerce-to-bang.rs:60:37 | LL | let x: (usize, !, usize) = (22, 44, 66); //~ ERROR mismatched types - | ^^ expected !, found integral variable + | ^^ expected !, found integer | = note: expected type `!` found type `{integer}` @@ -74,7 +74,7 @@ error[E0308]: mismatched types --> $DIR/coerce-to-bang.rs:65:41 | LL | let x: (usize, !, usize) = (return, 44, 66); - | ^^ expected !, found integral variable + | ^^ expected !, found integer | = note: expected type `!` found type `{integer}` @@ -83,7 +83,7 @@ error[E0308]: mismatched types --> $DIR/coerce-to-bang.rs:76:37 | LL | let x: (usize, !, usize) = (22, 44, return); //~ ERROR mismatched types - | ^^ expected !, found integral variable + | ^^ expected !, found integer | = note: expected type `!` found type `{integer}` diff --git a/src/test/ui/consts/const-integer-bool-ops.rs b/src/test/ui/consts/const-integer-bool-ops.rs index d557d70a52f10..f0d5a558e3529 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]; diff --git a/src/test/ui/consts/const-integer-bool-ops.stderr b/src/test/ui/consts/const-integer-bool-ops.stderr index 8ac3f617a3670..7885eb446f0dd 100644 --- a/src/test/ui/consts/const-integer-bool-ops.stderr +++ b/src/test/ui/consts/const-integer-bool-ops.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/const-integer-bool-ops.rs:1:18 | LL | const X: usize = 42 && 39; - | ^^ expected bool, found integral variable + | ^^ expected bool, found integer | = note: expected type `bool` found type `{integer}` @@ -11,7 +11,7 @@ error[E0308]: mismatched types --> $DIR/const-integer-bool-ops.rs:1:24 | LL | const X: usize = 42 && 39; - | ^^ expected bool, found integral variable + | ^^ expected bool, found integer | = note: expected type `bool` found type `{integer}` @@ -32,7 +32,7 @@ error[E0308]: mismatched types --> $DIR/const-integer-bool-ops.rs:11:19 | LL | const X1: usize = 42 || 39; - | ^^ expected bool, found integral variable + | ^^ expected bool, found integer | = note: expected type `bool` found type `{integer}` @@ -41,7 +41,7 @@ error[E0308]: mismatched types --> $DIR/const-integer-bool-ops.rs:11:25 | LL | const X1: usize = 42 || 39; - | ^^ expected bool, found integral variable + | ^^ expected bool, found integer | = note: expected type `bool` found type `{integer}` @@ -62,7 +62,7 @@ error[E0308]: mismatched types --> $DIR/const-integer-bool-ops.rs:21:19 | LL | const X2: usize = -42 || -39; - | ^^^ expected bool, found integral variable + | ^^^ expected bool, found integer | = note: expected type `bool` found type `{integer}` @@ -71,7 +71,7 @@ error[E0308]: mismatched types --> $DIR/const-integer-bool-ops.rs:21:26 | LL | const X2: usize = -42 || -39; - | ^^^ expected bool, found integral variable + | ^^^ expected bool, found integer | = note: expected type `bool` found type `{integer}` @@ -92,7 +92,7 @@ error[E0308]: mismatched types --> $DIR/const-integer-bool-ops.rs:31:19 | LL | const X3: usize = -42 && -39; - | ^^^ expected bool, found integral variable + | ^^^ expected bool, found integer | = note: expected type `bool` found type `{integer}` @@ -101,7 +101,7 @@ error[E0308]: mismatched types --> $DIR/const-integer-bool-ops.rs:31:26 | LL | const X3: usize = -42 && -39; - | ^^^ expected bool, found integral variable + | ^^^ expected bool, found integer | = note: expected type `bool` found type `{integer}` diff --git a/src/test/ui/conversion-methods.stderr b/src/test/ui/conversion-methods.stderr index 78099ea9e7cca..33fff4a0f68ed 100644 --- a/src/test/ui/conversion-methods.stderr +++ b/src/test/ui/conversion-methods.stderr @@ -28,7 +28,7 @@ error[E0308]: mismatched types LL | let _but_should_the_play: String = 2; // Perhaps surprisingly, we suggest .to_string() here | ^ | | - | expected struct `std::string::String`, found integral variable + | expected struct `std::string::String`, found integer | help: try using a conversion method: `2.to_string()` | = note: expected type `std::string::String` diff --git a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr b/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr index 9f09c9b53ccea..301704ec0c7ef 100644 --- a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr +++ b/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr @@ -4,7 +4,7 @@ error[E0308]: mismatched types LL | let sixteen: f32 = 16; | ^^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `16.0` | = note: expected type `f32` @@ -16,7 +16,7 @@ error[E0308]: mismatched types LL | let a_million_and_seventy: f64 = 1_000_070; | ^^^^^^^^^ | | - | expected f64, found integral variable + | expected f64, found integer | help: use a float literal: `1_000_070.0` | = note: expected type `f64` @@ -28,7 +28,7 @@ error[E0308]: mismatched types LL | let negative_nine: f32 = -9; | ^^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `-9.0` | = note: expected type `f32` @@ -38,7 +38,7 @@ error[E0308]: mismatched types --> $DIR/issue-53280-expected-float-found-integer-literal.rs:15:30 | LL | let sixteen_again: f64 = 0x10; - | ^^^^ expected f64, found integral variable + | ^^^^ expected f64, found integer | = note: expected type `f64` found type `{integer}` @@ -47,7 +47,7 @@ error[E0308]: mismatched types --> $DIR/issue-53280-expected-float-found-integer-literal.rs:17:30 | LL | let and_once_more: f32 = 0o20; - | ^^^^ expected f32, found integral variable + | ^^^^ expected f32, found integer | = note: expected type `f32` found type `{integer}` diff --git a/src/test/ui/error-codes/E0070.stderr b/src/test/ui/error-codes/E0070.stderr index a6a8925d99142..4c1cfd858e6c5 100644 --- a/src/test/ui/error-codes/E0070.stderr +++ b/src/test/ui/error-codes/E0070.stderr @@ -14,7 +14,7 @@ error[E0308]: mismatched types --> $DIR/E0070.rs:8:25 | LL | some_other_func() = 4; //~ ERROR E0070 - | ^ expected (), found integral variable + | ^ expected (), found integer | = note: expected type `()` found type `{integer}` diff --git a/src/test/ui/float-literal-inference-restrictions.stderr b/src/test/ui/float-literal-inference-restrictions.stderr index ea12c9caa77cc..a69c13507e6b2 100644 --- a/src/test/ui/float-literal-inference-restrictions.stderr +++ b/src/test/ui/float-literal-inference-restrictions.stderr @@ -4,7 +4,7 @@ error[E0308]: mismatched types LL | let x: f32 = 1; //~ ERROR mismatched types | ^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `1.0` | = note: expected type `f32` diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs b/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs index 8fdcbbae8debf..7e5b884103ed2 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs @@ -6,5 +6,5 @@ fn main() { //~^ ERROR mismatched types //~| expected type `std::option::Option` //~| found type `{integer}` - //~| expected enum `std::option::Option`, found integral variable + //~| expected enum `std::option::Option`, found integer } diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr b/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr index d16cbcfe1d5f4..62ded3e255a44 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr @@ -4,7 +4,7 @@ error[E0308]: mismatched types LL | x = 5; | ^ | | - | expected enum `std::option::Option`, found integral variable + | expected enum `std::option::Option`, found integer | help: try using a variant of the expected type: `Some(5)` | = note: expected type `std::option::Option` diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.stderr b/src/test/ui/generic/generic-arg-mismatch-recover.stderr index 1576b3c3915f9..37f6c61f06df3 100644 --- a/src/test/ui/generic/generic-arg-mismatch-recover.stderr +++ b/src/test/ui/generic/generic-arg-mismatch-recover.stderr @@ -8,7 +8,7 @@ error[E0308]: mismatched types --> $DIR/generic-arg-mismatch-recover.rs:6:33 | LL | Foo::<'static, 'static, ()>(&0); //~ ERROR wrong number of lifetime arguments - | ^^ expected (), found integral variable + | ^^ expected (), found integer | = note: expected type `&'static ()` found type `&{integer}` diff --git a/src/test/ui/if/if-let-arm-types.rs b/src/test/ui/if/if-let-arm-types.rs index ca115cc219e95..749c089ae9752 100644 --- a/src/test/ui/if/if-let-arm-types.rs +++ b/src/test/ui/if/if-let-arm-types.rs @@ -1,6 +1,6 @@ fn main() { if let Some(b) = None { //~ ERROR: `if let` arms have incompatible types - //~^ expected (), found integral variable + //~^ expected (), found integer //~| expected type `()` //~| found type `{integer}` () diff --git a/src/test/ui/if/if-let-arm-types.stderr b/src/test/ui/if/if-let-arm-types.stderr index 23cf5a45af055..fcf9e4695f675 100644 --- a/src/test/ui/if/if-let-arm-types.stderr +++ b/src/test/ui/if/if-let-arm-types.stderr @@ -2,13 +2,13 @@ error[E0308]: `if let` arms have incompatible types --> $DIR/if-let-arm-types.rs:2:5 | LL | / if let Some(b) = None { //~ ERROR: `if let` arms have incompatible types -LL | | //~^ expected (), found integral variable +LL | | //~^ expected (), found integer LL | | //~| expected type `()` LL | | //~| found type `{integer}` ... | LL | | 1 LL | | }; - | |_____^ expected (), found integral variable + | |_____^ expected (), found integer | = note: expected type `()` found type `{integer}` diff --git a/src/test/ui/integral-variable-unification-error.rs b/src/test/ui/integral-variable-unification-error.rs index 98a77e9c82f67..3eefcdea3d902 100644 --- a/src/test/ui/integral-variable-unification-error.rs +++ b/src/test/ui/integral-variable-unification-error.rs @@ -4,5 +4,5 @@ fn main() { //~^ ERROR mismatched types //~| expected type `{integer}` //~| found type `{float}` - //~| expected integral variable, found floating-point variable + //~| expected integer, found floating-point number } diff --git a/src/test/ui/integral-variable-unification-error.stderr b/src/test/ui/integral-variable-unification-error.stderr index 7670f7a0e8da7..262203b7b8e4d 100644 --- a/src/test/ui/integral-variable-unification-error.stderr +++ b/src/test/ui/integral-variable-unification-error.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/integral-variable-unification-error.rs:3:9 | LL | x = 5.0; - | ^^^ expected integral variable, found floating-point variable + | ^^^ expected integer, found floating-point number | = note: expected type `{integer}` found type `{float}` diff --git a/src/test/ui/issues/issue-13407.stderr b/src/test/ui/issues/issue-13407.stderr index 90b5d22a28425..1f4c7dfb0da02 100644 --- a/src/test/ui/issues/issue-13407.stderr +++ b/src/test/ui/issues/issue-13407.stderr @@ -8,7 +8,7 @@ error[E0308]: mismatched types --> $DIR/issue-13407.rs:6:12 | LL | A::C = 1; - | ^ expected struct `A::C`, found integral variable + | ^ expected struct `A::C`, found integer | = note: expected type `A::C` found type `{integer}` diff --git a/src/test/ui/issues/issue-14091.stderr b/src/test/ui/issues/issue-14091.stderr index c7616e5ab4f41..24a076624edee 100644 --- a/src/test/ui/issues/issue-14091.stderr +++ b/src/test/ui/issues/issue-14091.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-14091.rs:2:5 | LL | assert!(1,1); - | ^^^^^^^^^^^^^ expected bool, found integral variable + | ^^^^^^^^^^^^^ expected bool, found integer | = note: expected type `bool` found type `{integer}` diff --git a/src/test/ui/issues/issue-19991.rs b/src/test/ui/issues/issue-19991.rs index 349a1d77c2b7c..e9094ecc01589 100644 --- a/src/test/ui/issues/issue-19991.rs +++ b/src/test/ui/issues/issue-19991.rs @@ -5,7 +5,7 @@ fn main() { if let Some(homura) = Some("madoka") { //~ ERROR missing an else clause //~| expected type `()` //~| found type `{integer}` - //~| expected (), found integral variable + //~| expected (), found integer 765 }; } diff --git a/src/test/ui/issues/issue-19991.stderr b/src/test/ui/issues/issue-19991.stderr index cf3d55e821091..ee5d363c4bd2b 100644 --- a/src/test/ui/issues/issue-19991.stderr +++ b/src/test/ui/issues/issue-19991.stderr @@ -4,10 +4,10 @@ error[E0317]: if may be missing an else clause LL | / if let Some(homura) = Some("madoka") { //~ ERROR missing an else clause LL | | //~| expected type `()` LL | | //~| found type `{integer}` -LL | | //~| expected (), found integral variable +LL | | //~| expected (), found integer LL | | 765 LL | | }; - | |_____^ expected (), found integral variable + | |_____^ expected (), found integer | = note: expected type `()` found type `{integer}` diff --git a/src/test/ui/issues/issue-33504.stderr b/src/test/ui/issues/issue-33504.stderr index 95d6c55c1ea50..716aa8a863292 100644 --- a/src/test/ui/issues/issue-33504.stderr +++ b/src/test/ui/issues/issue-33504.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-33504.rs:7:13 | LL | let Test = 1; //~ ERROR mismatched types - | ^^^^ expected integral variable, found struct `Test` + | ^^^^ expected integer, found struct `Test` | = note: expected type `{integer}` found type `Test` diff --git a/src/test/ui/issues/issue-37665.stderr b/src/test/ui/issues/issue-37665.stderr index 0022ab73e1ad9..c3599fab68507 100644 --- a/src/test/ui/issues/issue-37665.stderr +++ b/src/test/ui/issues/issue-37665.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-37665.rs:10:17 | LL | let x: () = 0; //~ ERROR: mismatched types - | ^ expected (), found integral variable + | ^ expected (), found integer | = note: expected type `()` found type `{integer}` diff --git a/src/test/ui/issues/issue-4201.rs b/src/test/ui/issues/issue-4201.rs index c9098c843f92f..2f1d6d2177e40 100644 --- a/src/test/ui/issues/issue-4201.rs +++ b/src/test/ui/issues/issue-4201.rs @@ -5,7 +5,7 @@ fn main() { //~^ ERROR if may be missing an else clause //~| expected type `()` //~| found type `{integer}` -//~| expected (), found integral variable +//~| expected (), found integer 1 }; } diff --git a/src/test/ui/issues/issue-4201.stderr b/src/test/ui/issues/issue-4201.stderr index ebeb870183e45..4f8ec96d53151 100644 --- a/src/test/ui/issues/issue-4201.stderr +++ b/src/test/ui/issues/issue-4201.stderr @@ -6,10 +6,10 @@ LL | } else if false { LL | | //~^ ERROR if may be missing an else clause LL | | //~| expected type `()` LL | | //~| found type `{integer}` -LL | | //~| expected (), found integral variable +LL | | //~| expected (), found integer LL | | 1 LL | | }; - | |_____^ expected (), found integral variable + | |_____^ expected (), found integer | = note: expected type `()` found type `{integer}` diff --git a/src/test/ui/issues/issue-4968.rs b/src/test/ui/issues/issue-4968.rs index 3bf65c5ce8e6e..383b9ecd466fe 100644 --- a/src/test/ui/issues/issue-4968.rs +++ b/src/test/ui/issues/issue-4968.rs @@ -6,5 +6,5 @@ fn main() { //~^ ERROR mismatched types //~| expected type `{integer}` //~| found type `(isize, isize)` - //~| expected integral variable, found tuple + //~| expected integer, found tuple } diff --git a/src/test/ui/issues/issue-4968.stderr b/src/test/ui/issues/issue-4968.stderr index 2f6b4b95882fc..a925783723b44 100644 --- a/src/test/ui/issues/issue-4968.stderr +++ b/src/test/ui/issues/issue-4968.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/issue-4968.rs:5:16 | LL | match 42 { A => () } - | ^ expected integral variable, found tuple + | ^ expected integer, found tuple | = note: expected type `{integer}` found type `(isize, isize)` diff --git a/src/test/ui/keyword/keyword-false-as-identifier.stderr b/src/test/ui/keyword/keyword-false-as-identifier.stderr index de5dfcfbe4360..6c8dffa7e22c6 100644 --- a/src/test/ui/keyword/keyword-false-as-identifier.stderr +++ b/src/test/ui/keyword/keyword-false-as-identifier.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/keyword-false-as-identifier.rs:2:9 | LL | let false = 22; //~ error: mismatched types - | ^^^^^ expected integral variable, found bool + | ^^^^^ expected integer, found bool | = note: expected type `{integer}` found type `bool` diff --git a/src/test/ui/keyword/keyword-true-as-identifier.stderr b/src/test/ui/keyword/keyword-true-as-identifier.stderr index cc5c6fe45565f..e5d3938e54ac2 100644 --- a/src/test/ui/keyword/keyword-true-as-identifier.stderr +++ b/src/test/ui/keyword/keyword-true-as-identifier.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/keyword-true-as-identifier.rs:2:9 | LL | let true = 22; //~ error: mismatched types - | ^^^^ expected integral variable, found bool + | ^^^^ expected integer, found bool | = note: expected type `{integer}` found type `bool` diff --git a/src/test/ui/loops/loop-break-value.stderr b/src/test/ui/loops/loop-break-value.stderr index 8fc4ec94366a5..3e009c007e08d 100644 --- a/src/test/ui/loops/loop-break-value.stderr +++ b/src/test/ui/loops/loop-break-value.stderr @@ -91,7 +91,7 @@ error[E0308]: mismatched types --> $DIR/loop-break-value.rs:11:19 | LL | break 123; //~ ERROR mismatched types - | ^^^ expected &str, found integral variable + | ^^^ expected &str, found integer | = note: expected type `&str` found type `{integer}` @@ -118,7 +118,7 @@ error[E0308]: mismatched types --> $DIR/loop-break-value.rs:73:26 | LL | break 'c 123; //~ ERROR mismatched types - | ^^^ expected (), found integral variable + | ^^^ expected (), found integer | = note: expected type `()` found type `{integer}` @@ -136,7 +136,7 @@ error[E0308]: mismatched types --> $DIR/loop-break-value.rs:85:15 | LL | break 2; //~ ERROR mismatched types - | ^ expected (), found integral variable + | ^ expected (), found integer | = note: expected type `()` found type `{integer}` @@ -145,7 +145,7 @@ error[E0308]: mismatched types --> $DIR/loop-break-value.rs:90:9 | LL | break; //~ ERROR mismatched types - | ^^^^^ expected (), found integral variable + | ^^^^^ expected (), found integer | = note: expected type `()` found type `{integer}` diff --git a/src/test/ui/match/match-range-fail.stderr b/src/test/ui/match/match-range-fail.stderr index 8d067c703b731..54969927433a4 100644 --- a/src/test/ui/match/match-range-fail.stderr +++ b/src/test/ui/match/match-range-fail.stderr @@ -20,7 +20,7 @@ error[E0308]: mismatched types --> $DIR/match-range-fail.rs:17:9 | LL | 'c' ..= 100 => { } - | ^^^^^^^^^^^ expected integral variable, found char + | ^^^^^^^^^^^ expected integer, found char | = note: expected type `{integer}` found type `char` diff --git a/src/test/ui/methods/method-self-arg-1.rs b/src/test/ui/methods/method-self-arg-1.rs index 48be31d94f2ee..4a78ad780c412 100644 --- a/src/test/ui/methods/method-self-arg-1.rs +++ b/src/test/ui/methods/method-self-arg-1.rs @@ -15,5 +15,5 @@ fn main() { Foo::bar(&42); //~ ERROR mismatched types //~| expected type `&Foo` //~| found type `&{integer}` - //~| expected struct `Foo`, found integral variable + //~| expected struct `Foo`, found integer } diff --git a/src/test/ui/methods/method-self-arg-1.stderr b/src/test/ui/methods/method-self-arg-1.stderr index 0756e9b68f2a3..8c80d01b18cb9 100644 --- a/src/test/ui/methods/method-self-arg-1.stderr +++ b/src/test/ui/methods/method-self-arg-1.stderr @@ -14,7 +14,7 @@ error[E0308]: mismatched types --> $DIR/method-self-arg-1.rs:15:14 | LL | Foo::bar(&42); //~ ERROR mismatched types - | ^^^ expected struct `Foo`, found integral variable + | ^^^ expected struct `Foo`, found integer | = note: expected type `&Foo` found type `&{integer}` diff --git a/src/test/ui/mir-unpretty.stderr b/src/test/ui/mir-unpretty.stderr index 913999c2290ba..59e8c0bf09029 100644 --- a/src/test/ui/mir-unpretty.stderr +++ b/src/test/ui/mir-unpretty.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/mir-unpretty.rs:4:17 | LL | let x: () = 0; //~ ERROR: mismatched types - | ^ expected (), found integral variable + | ^ expected (), found integer | = note: expected type `()` found type `{integer}` diff --git a/src/test/ui/mismatched_types/E0409.stderr b/src/test/ui/mismatched_types/E0409.stderr index 4d5bfceb74e95..08f132efd0526 100644 --- a/src/test/ui/mismatched_types/E0409.stderr +++ b/src/test/ui/mismatched_types/E0409.stderr @@ -10,7 +10,7 @@ error[E0308]: mismatched types --> $DIR/E0409.rs:5:23 | LL | (0, ref y) | (y, 0) => {} //~ ERROR E0409 - | ^ expected &{integer}, found integral variable + | ^ expected &{integer}, found integer | = note: expected type `&{integer}` found type `{integer}` diff --git a/src/test/ui/mismatched_types/abridged.stderr b/src/test/ui/mismatched_types/abridged.stderr index 5256148c771f3..6a5cf7db4eed9 100644 --- a/src/test/ui/mismatched_types/abridged.stderr +++ b/src/test/ui/mismatched_types/abridged.stderr @@ -49,7 +49,7 @@ LL | fn d() -> X, String> { | ---------------------------- expected `X, std::string::String>` because of return type ... LL | x //~ ERROR mismatched types - | ^ expected struct `std::string::String`, found integral variable + | ^ expected struct `std::string::String`, found integer | = note: expected type `X, std::string::String>` found type `X, {integer}>` @@ -61,7 +61,7 @@ LL | fn e() -> X, String> { | ---------------------------- expected `X, std::string::String>` because of return type ... LL | x //~ ERROR mismatched types - | ^ expected struct `std::string::String`, found integral variable + | ^ expected struct `std::string::String`, found integer | = note: expected type `X, _>` found type `X, _>` diff --git a/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr b/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr index 1de8e18c587ba..25203d6f35d28 100644 --- a/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr +++ b/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/for-loop-has-unit-body.rs:3:9 | LL | x //~ ERROR mismatched types - | ^ expected (), found integral variable + | ^ expected (), found integer | = note: expected type `()` found type `{integer}` diff --git a/src/test/ui/proc-macro/span-preservation.stderr b/src/test/ui/proc-macro/span-preservation.stderr index 64d0173cb9c22..1f9103a6d2ee8 100644 --- a/src/test/ui/proc-macro/span-preservation.stderr +++ b/src/test/ui/proc-macro/span-preservation.stderr @@ -38,7 +38,7 @@ error[E0308]: mismatched types LL | extern "C" fn baz() { | - possibly return type missing here? LL | 0 //~ ERROR mismatched types - | ^ expected (), found integral variable + | ^ expected (), found integer | = note: expected type `()` found type `{integer}` diff --git a/src/test/ui/repeat_count.rs b/src/test/ui/repeat_count.rs index 74385c7949790..c42dc8c99719d 100644 --- a/src/test/ui/repeat_count.rs +++ b/src/test/ui/repeat_count.rs @@ -16,7 +16,7 @@ fn main() { //~^ ERROR mismatched types //~| expected type `usize` //~| found type `{float}` - //~| expected usize, found floating-point variable + //~| expected usize, found floating-point number let e = [0; "foo"]; //~^ ERROR mismatched types //~| expected type `usize` diff --git a/src/test/ui/repeat_count.stderr b/src/test/ui/repeat_count.stderr index b481cd187c597..df3227bfcde13 100644 --- a/src/test/ui/repeat_count.stderr +++ b/src/test/ui/repeat_count.stderr @@ -23,7 +23,7 @@ error[E0308]: mismatched types --> $DIR/repeat_count.rs:15:17 | LL | let d = [0; 0.5]; - | ^^^ expected usize, found floating-point variable + | ^^^ expected usize, found floating-point number | = note: expected type `usize` found type `{float}` diff --git a/src/test/ui/slightly-nice-generic-literal-messages.rs b/src/test/ui/slightly-nice-generic-literal-messages.rs index fcbc2a169a53c..cd0ee174af528 100644 --- a/src/test/ui/slightly-nice-generic-literal-messages.rs +++ b/src/test/ui/slightly-nice-generic-literal-messages.rs @@ -8,7 +8,7 @@ fn main() { //~^ ERROR mismatched types //~| expected type `Foo<{float}, _>` //~| found type `{integer}` - //~| expected struct `Foo`, found integral variable + //~| expected struct `Foo`, found integer } } diff --git a/src/test/ui/slightly-nice-generic-literal-messages.stderr b/src/test/ui/slightly-nice-generic-literal-messages.stderr index 767faf5291488..76ebc007df34f 100644 --- a/src/test/ui/slightly-nice-generic-literal-messages.stderr +++ b/src/test/ui/slightly-nice-generic-literal-messages.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/slightly-nice-generic-literal-messages.rs:7:9 | LL | 1 => {} - | ^ expected struct `Foo`, found integral variable + | ^ expected struct `Foo`, found integer | = note: expected type `Foo<{float}, _>` found type `{integer}` diff --git a/src/test/ui/structs/struct-base-wrong-type-2.rs b/src/test/ui/structs/struct-base-wrong-type-2.rs index a88c5d1c13b48..562f75b8e85bd 100644 --- a/src/test/ui/structs/struct-base-wrong-type-2.rs +++ b/src/test/ui/structs/struct-base-wrong-type-2.rs @@ -15,5 +15,5 @@ fn main() { let f__isize = Foo { a: 2, ..4 }; //~ ERROR mismatched types //~| expected type `Foo` //~| found type `{integer}` - //~| expected struct `Foo`, found integral variable + //~| expected struct `Foo`, found integer } diff --git a/src/test/ui/structs/struct-base-wrong-type-2.stderr b/src/test/ui/structs/struct-base-wrong-type-2.stderr index 44ac3483ad6d1..b15ea51bb2d4c 100644 --- a/src/test/ui/structs/struct-base-wrong-type-2.stderr +++ b/src/test/ui/structs/struct-base-wrong-type-2.stderr @@ -11,7 +11,7 @@ error[E0308]: mismatched types --> $DIR/struct-base-wrong-type-2.rs:15:34 | LL | let f__isize = Foo { a: 2, ..4 }; //~ ERROR mismatched types - | ^ expected struct `Foo`, found integral variable + | ^ expected struct `Foo`, found integer | = note: expected type `Foo` found type `{integer}` diff --git a/src/test/ui/structs/struct-base-wrong-type.rs b/src/test/ui/structs/struct-base-wrong-type.rs index 83b5444815159..6252673c296fb 100644 --- a/src/test/ui/structs/struct-base-wrong-type.rs +++ b/src/test/ui/structs/struct-base-wrong-type.rs @@ -14,7 +14,7 @@ static foo: Foo = Foo { a: 2, ..bar }; //~ ERROR mismatched types static foo_i: Foo = Foo { a: 2, ..4 }; //~ ERROR mismatched types //~| expected type `Foo` //~| found type `{integer}` - //~| expected struct `Foo`, found integral variable + //~| expected struct `Foo`, found integer fn main() { let b = Bar { x: 5 }; diff --git a/src/test/ui/structs/struct-base-wrong-type.stderr b/src/test/ui/structs/struct-base-wrong-type.stderr index 8519a9510a9fa..045eb610f7d1f 100644 --- a/src/test/ui/structs/struct-base-wrong-type.stderr +++ b/src/test/ui/structs/struct-base-wrong-type.stderr @@ -11,7 +11,7 @@ error[E0308]: mismatched types --> $DIR/struct-base-wrong-type.rs:14:35 | LL | static foo_i: Foo = Foo { a: 2, ..4 }; //~ ERROR mismatched types - | ^ expected struct `Foo`, found integral variable + | ^ expected struct `Foo`, found integer | = note: expected type `Foo` found type `{integer}` diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.rs b/src/test/ui/structs/structure-constructor-type-mismatch.rs index 54319e1ea4fc4..8850f6ea89fa3 100644 --- a/src/test/ui/structs/structure-constructor-type-mismatch.rs +++ b/src/test/ui/structs/structure-constructor-type-mismatch.rs @@ -16,32 +16,32 @@ fn main() { let pt = PointF { x: 1, //~^ ERROR mismatched types - //~| expected f32, found integral variable + //~| expected f32, found integer y: 2, //~^ ERROR mismatched types - //~| expected f32, found integral variable + //~| expected f32, found integer }; let pt2 = Point:: { x: 3, //~^ ERROR mismatched types - //~| expected f32, found integral variable + //~| expected f32, found integer y: 4, //~^ ERROR mismatched types - //~| expected f32, found integral variable + //~| expected f32, found integer }; let pair = PairF { x: 5, //~^ ERROR mismatched types - //~| expected f32, found integral variable + //~| expected f32, found integer y: 6, }; let pair2 = PairF:: { x: 7, //~^ ERROR mismatched types - //~| expected f32, found integral variable + //~| expected f32, found integer y: 8, }; diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.stderr b/src/test/ui/structs/structure-constructor-type-mismatch.stderr index 6abc75110e1f0..3c1ed8e69a6bd 100644 --- a/src/test/ui/structs/structure-constructor-type-mismatch.stderr +++ b/src/test/ui/structs/structure-constructor-type-mismatch.stderr @@ -4,7 +4,7 @@ error[E0308]: mismatched types LL | x: 1, | ^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `1.0` | = note: expected type `f32` @@ -16,7 +16,7 @@ error[E0308]: mismatched types LL | y: 2, | ^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `2.0` | = note: expected type `f32` @@ -28,7 +28,7 @@ error[E0308]: mismatched types LL | x: 3, | ^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `3.0` | = note: expected type `f32` @@ -40,7 +40,7 @@ error[E0308]: mismatched types LL | y: 4, | ^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `4.0` | = note: expected type `f32` @@ -52,7 +52,7 @@ error[E0308]: mismatched types LL | x: 5, | ^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `5.0` | = note: expected type `f32` @@ -64,7 +64,7 @@ error[E0308]: mismatched types LL | x: 7, | ^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `7.0` | = note: expected type `f32` @@ -82,7 +82,7 @@ error[E0308]: mismatched types LL | x: 9, //~ ERROR mismatched types | ^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `9.0` | = note: expected type `f32` @@ -94,7 +94,7 @@ error[E0308]: mismatched types LL | y: 10, //~ ERROR mismatched types | ^^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `10.0` | = note: expected type `f32` @@ -110,7 +110,7 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:54:9 | LL | PointF:: { .. } => {} //~ ERROR wrong number of type arguments - | ^^^^^^^^^^^^^^^^^^^^ expected integral variable, found f32 + | ^^^^^^^^^^^^^^^^^^^^ expected integer, found f32 | = note: expected type `Point<{integer}>` found type `Point` @@ -119,7 +119,7 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:59:9 | LL | PointF { .. } => {} //~ ERROR mismatched types - | ^^^^^^^^^^^^^ expected integral variable, found f32 + | ^^^^^^^^^^^^^ expected integer, found f32 | = note: expected type `Point<{integer}>` found type `Point` @@ -128,7 +128,7 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:67:9 | LL | PairF:: { .. } => {} //~ ERROR mismatched types - | ^^^^^^^^^^^^^^^^^^^ expected integral variable, found f32 + | ^^^^^^^^^^^^^^^^^^^ expected integer, found f32 | = note: expected type `Pair<{integer}, {integer}>` found type `Pair` diff --git a/src/test/ui/try-block/try-block-type-error.stderr b/src/test/ui/try-block/try-block-type-error.stderr index cf52c4ce15266..0cbd737debde5 100644 --- a/src/test/ui/try-block/try-block-type-error.stderr +++ b/src/test/ui/try-block/try-block-type-error.stderr @@ -4,7 +4,7 @@ error[E0271]: type mismatch resolving ` as std::ops::Tr LL | 42 | ^^ | | - | expected f32, found integral variable + | expected f32, found integer | help: use a float literal: `42.0` | = note: expected type `f32` diff --git a/src/test/ui/type/type-mismatch-multiple.rs b/src/test/ui/type/type-mismatch-multiple.rs index f2e289a11b75e..1904ccf5d5945 100644 --- a/src/test/ui/type/type-mismatch-multiple.rs +++ b/src/test/ui/type/type-mismatch-multiple.rs @@ -4,7 +4,7 @@ fn main() { let a: bool = 1; let b: i32 = true; } //~^ ERROR mismatched types //~| expected type `bool` //~| found type `{integer}` -//~| expected bool, found integral variable +//~| expected bool, found integer //~| ERROR mismatched types //~| expected i32, found bool diff --git a/src/test/ui/type/type-mismatch-multiple.stderr b/src/test/ui/type/type-mismatch-multiple.stderr index b38579046b585..8f6b23ea091a2 100644 --- a/src/test/ui/type/type-mismatch-multiple.stderr +++ b/src/test/ui/type/type-mismatch-multiple.stderr @@ -2,7 +2,7 @@ error[E0308]: mismatched types --> $DIR/type-mismatch-multiple.rs:3:27 | LL | fn main() { let a: bool = 1; let b: i32 = true; } - | ^ expected bool, found integral variable + | ^ expected bool, found integer | = note: expected type `bool` found type `{integer}`