about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2018-01-22 19:13:06 -0800
committerEsteban Küber <esteban@kuber.com.ar>2018-02-01 15:06:22 -0800
commitf7c61783e4cbc169955c7e633ecf629ed901a54e (patch)
tree2559b0811769c07f377b9776be784d3471378df4
parent27a23db66032be9be96e697fdda50e73b0b90cc5 (diff)
downloadrust-f7c61783e4cbc169955c7e633ecf629ed901a54e.tar.gz
rust-f7c61783e4cbc169955c7e633ecf629ed901a54e.zip
Fix tests
-rw-r--r--src/libsyntax/parse/parser.rs2
-rw-r--r--src/test/compile-fail/const-eval-overflow-4b.rs2
-rw-r--r--src/test/compile-fail/ufcs-qpath-self-mismatch.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 5b55f0f2328..38017020730 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -779,7 +779,7 @@ impl<'a> Parser<'a> {
 
     pub fn parse_ident_attr(&mut self) -> PResult<'a, ast::Ident> {
         match self.token {
-            token::Ident(i) if i.name == keywords::SelfType.name() {
+            token::Ident(i) if i.name == keywords::SelfType.name() => {
                 self.bump();
                 Ok(i)
             }
diff --git a/src/test/compile-fail/const-eval-overflow-4b.rs b/src/test/compile-fail/const-eval-overflow-4b.rs
index 02072e9a1a1..6028df18839 100644
--- a/src/test/compile-fail/const-eval-overflow-4b.rs
+++ b/src/test/compile-fail/const-eval-overflow-4b.rs
@@ -22,7 +22,7 @@ const A_I8_T
     : [u32; (i8::MAX as i8 + 1u8) as usize]
     //~^ ERROR mismatched types
     //~| expected i8, found u8
-    //~| ERROR the trait bound `i8: std::ops::Add<u8>` is not satisfied
+    //~| ERROR cannot add `u8` to `i8`
     = [0; (i8::MAX as usize) + 1];
 
 
diff --git a/src/test/compile-fail/ufcs-qpath-self-mismatch.rs b/src/test/compile-fail/ufcs-qpath-self-mismatch.rs
index 94a98b1582a..caf510071bd 100644
--- a/src/test/compile-fail/ufcs-qpath-self-mismatch.rs
+++ b/src/test/compile-fail/ufcs-qpath-self-mismatch.rs
@@ -12,7 +12,7 @@ use std::ops::Add;
 
 fn main() {
     <i32 as Add<u32>>::add(1, 2);
-    //~^ ERROR `i32: std::ops::Add<u32>` is not satisfied
+    //~^ ERROR cannot add `u32` to `i32`
     <i32 as Add<i32>>::add(1u32, 2);
     //~^ ERROR mismatched types
     <i32 as Add<i32>>::add(1, 2u32);