---

yaml
---
r: 187182
b: refs/heads/try
c: 0643494
h: refs/heads/master
v: v3

Author: bombless

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
-refs/heads/try: 61ea8b33d03b2b434793e6fc8f0a3cc67b90a72a
+refs/heads/try: 0643494bc4d093dd660044b86c1d43820c40daf8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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: `<`
     _ => ()
   }
 }

branches/try/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: `<`

branches/try/src/test/compile-fail/issue-22426.rs renamed to branches/try/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!")
             }
         }

branches/try/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 => (),
+    _ => ()
+  }
+}