---

yaml
---
r: 121854
b: refs/heads/master
c: 7bad96e
h: refs/heads/master
v: v3

Author: jbclements

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 47eec97cdab94989cc4c5f20a1e1f2310df997aa
+refs/heads/master: 7bad96e742b187b671500702bccb37ab1724bae5
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: afdfe40aa0b7dfc7800dddbc1f55da979abfe486
 refs/heads/try: 18dc3bc9e3314a250c0718ab329938e676410cdf

trunk/src/libsyntax/ext/expand.rs

@@ -1274,13 +1274,13 @@ mod test {
     }
 
     // FIXME #9384, match variable hygiene. Should expand into
-    // fn z() {match 8 {x_1 => {match 9 {x_2 | x_2 => x_2 + x_1}}}}
+    // fn z() {match 8 {x_1 => {match 9 {x_2 | x_2 if x_2 == x_1 => x_2 + x_1}}}}
     #[test] fn issue_9384(){
         run_renaming_test(
-            &("macro_rules! bad_macro (($ex:expr) => ({match 9 {x | x => x + $ex}}))
-              fn z() {match 8 {x => bad_macro!(_x)}}",
+            &("macro_rules! bad_macro (($ex:expr) => ({match 9 {x | x if x == $ex => x + $ex}}))
+              fn z() {match 8 {x => bad_macro!(x)}}",
               // NB: the third "binding" is the repeat of the second one.
-              vec!(vec!(1),vec!(0),vec!(0)),
+              vec!(vec!(1,3),vec!(0,2),vec!(0,2)),
               true),
             0)
     }