rust-lang · bors · Jan 2, 2019 · Jan 1, 2019
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,38 +1,38 @@
 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];
 //~^ ERROR evaluation of constant value failed
 
 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];
 //~^ ERROR evaluation of constant value failed
 
 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];
 //~^ ERROR evaluation of constant value failed
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,5 +6,5 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected type `std::option::Option<usize>`
     //~| 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
@@ -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<usize>`

diff --git 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
@@ -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
@@ -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
@@ -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
 }