---

yaml
---
r: 38833
b: refs/heads/incoming
c: 3d8df99
h: refs/heads/master
i:
  38831: 6cbbcb7
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 9d276b11e570aabb0c5135208436ce4eadaf2804
+refs/heads/incoming: 3d8df9947fae1c55a1de9b461ae142059c1edcac
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/run-pass/issue-3121.rs

@@ -0,0 +1,18 @@
+// xfail-test
+enum side { mayo, catsup, vinegar }
+enum order { hamburger, fries(side), shake }
+enum meal { to_go(order), for_here(order) }
+
+fn foo(m: @meal, cond: bool) {
+    match *m {
+      to_go(_) => { }
+      for_here(_) if cond => {}
+      for_here(hamburger) => {}
+      for_here(fries(_s)) => {}
+      for_here(shake) => {}
+    }
+}
+
+fn main() {
+    foo(@for_here(hamburger), true)
+}

branches/incoming/src/test/run-pass/issue-3895.rs

@@ -0,0 +1,9 @@
+// xfail-test
+fn main() {
+    enum State { BadChar, BadSyntax }
+    
+    match BadChar {
+        _ if true => BadChar,
+        BadChar | BadSyntax => fail ,
+    };
+}