about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2019-01-16 09:28:26 +0900
committerYuki Okushi <huyuumi.dev@gmail.com>2019-01-16 09:28:26 +0900
commitd33ee3fefa3fad88fee81b5abb316e94c387d72e (patch)
treeb561d2f9c13e94546cc023444a0cc74d2a2ff507
parentec8db2a94446f2ef4da7ac89bbe5e171fe17e46f (diff)
downloadrust-d33ee3fefa3fad88fee81b5abb316e94c387d72e.tar.gz
rust-d33ee3fefa3fad88fee81b5abb316e94c387d72e.zip
Fix tests
-rw-r--r--src/test/ui/parser/lex-bad-char-literals-3.rs1
-rw-r--r--src/test/ui/parser/lex-bad-char-literals-3.stderr12
-rw-r--r--src/test/ui/parser/lex-bad-char-literals-5.rs1
-rw-r--r--src/test/ui/parser/lex-bad-char-literals-5.stderr12
4 files changed, 2 insertions, 24 deletions
diff --git a/src/test/ui/parser/lex-bad-char-literals-3.rs b/src/test/ui/parser/lex-bad-char-literals-3.rs
index f8749708f77..d14ec1cc515 100644
--- a/src/test/ui/parser/lex-bad-char-literals-3.rs
+++ b/src/test/ui/parser/lex-bad-char-literals-3.rs
@@ -1,7 +1,6 @@
 // This test needs to the last one appearing in this file as it kills the parser
 static c: char =
     '●●' //~ ERROR: character literal may only contain one codepoint
-         //~| ERROR: mismatched types
 ;
 
 fn main() {}
diff --git a/src/test/ui/parser/lex-bad-char-literals-3.stderr b/src/test/ui/parser/lex-bad-char-literals-3.stderr
index 89f18e3e2aa..dde4a7db3aa 100644
--- a/src/test/ui/parser/lex-bad-char-literals-3.stderr
+++ b/src/test/ui/parser/lex-bad-char-literals-3.stderr
@@ -8,15 +8,5 @@ help: if you meant to write a `str` literal, use double quotes
 LL |     "●●" //~ ERROR: character literal may only contain one codepoint
    |     ^^^^
 
-error[E0308]: mismatched types
-  --> $DIR/lex-bad-char-literals-3.rs:3:5
-   |
-LL |     '●●' //~ ERROR: character literal may only contain one codepoint
-   |     ^^^^ expected char, found reference
-   |
-   = note: expected type `char`
-              found type `&'static str`
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/parser/lex-bad-char-literals-5.rs b/src/test/ui/parser/lex-bad-char-literals-5.rs
index 247289ea4d5..1236e76de42 100644
--- a/src/test/ui/parser/lex-bad-char-literals-5.rs
+++ b/src/test/ui/parser/lex-bad-char-literals-5.rs
@@ -2,7 +2,6 @@
 // This test needs to the last one appearing in this file as it kills the parser
 static c: char =
     '\x10\x10'  //~ ERROR: character literal may only contain one codepoint
-                //~| ERROR: mismatched types
 ;
 
 fn main() {}
diff --git a/src/test/ui/parser/lex-bad-char-literals-5.stderr b/src/test/ui/parser/lex-bad-char-literals-5.stderr
index 523d71ff49d..4f734eaeff3 100644
--- a/src/test/ui/parser/lex-bad-char-literals-5.stderr
+++ b/src/test/ui/parser/lex-bad-char-literals-5.stderr
@@ -8,15 +8,5 @@ help: if you meant to write a `str` literal, use double quotes
 LL |     "/x10/x10"  //~ ERROR: character literal may only contain one codepoint
    |     ^^^^^^^^^^
 
-error[E0308]: mismatched types
-  --> $DIR/lex-bad-char-literals-5.rs:4:5
-   |
-LL |     '/x10/x10'  //~ ERROR: character literal may only contain one codepoint
-   |     ^^^^^^^^^^ expected char, found reference
-   |
-   = note: expected type `char`
-              found type `&'static str`
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0308`.