Fix tests

Author: bombless

src/test/compile-fail/issue-22426-1.rs

@@ -10,7 +10,8 @@
 
 fn main() {
   match 42 {
-    x < 7 => (), //~ ERROR unexpected token `<`
+    x < 7 => (),
+   //~^ error: unexpected token: `<`
     _ => ()
   }
 }

src/test/compile-fail/issue-22426-2.rs

@@ -8,4 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn a(B<) {} //~ ERROR unexpected token `<`
+fn a(B<) {}
+   //~^ error: unexpected token: `<`

src/test/compile-fail/issue-22426.rs renamed to src/test/compile-fail/issue-22426-3.rs

@@ -13,7 +13,8 @@ struct Foo<T>(T, T);
 impl<T> Foo<T> {
     fn foo(&self) {
         match *self {
-            Foo<T>(x, y) => { //~ ERROR unexpected token `<`
+            Foo<T>(x, y) => {
+            //~^ error: unexpected token: `<`
               println!("Goodbye, World!")
             }
         }

src/test/run-pass/issue-22426.rs

@@ -13,9 +13,16 @@ struct Foo<T>(T, T);
 impl<T> Foo<T> {
     fn foo(&self) {
         match *self {
-            Foo::<T>(ref x, ref y) => { //~ ERROR unexpected token `<`
+            Foo::<T>(ref x, ref y) => {
               println!("Goodbye, World!")
             }
         }
     }
 }
+
+fn main() {
+  match 42 {
+    x if x < 7 => (),
+    _ => ()
+  }
+}