about summary refs log tree commit diff
path: root/src/test/ui/methods
diff options
context:
space:
mode:
authorYuning Zhang <codeworm96@outlook.com>2018-12-31 20:43:08 -0500
committerYuning Zhang <codeworm96@outlook.com>2018-12-31 20:43:08 -0500
commit710dcbd3818deca8f193a45e321b58af3c24feae (patch)
tree0bb5f760a042393b0e4eb583f1b776f3cd196ba7 /src/test/ui/methods
parent6efaef61899f6551914156f69809aa7d5854399d (diff)
downloadrust-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/methods')
-rw-r--r--src/test/ui/methods/method-self-arg-1.rs2
-rw-r--r--src/test/ui/methods/method-self-arg-1.stderr2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/methods/method-self-arg-1.rs b/src/test/ui/methods/method-self-arg-1.rs
index 48be31d94f2..4a78ad780c4 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 0756e9b68f2..8c80d01b18c 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}`