---

yaml
---
r: 79380
b: refs/heads/try
c: dbb0d5d
h: refs/heads/master
v: v3

Author: jbclements

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e6de6b7da8ee88bf84b0e217900051334be08da
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
-refs/heads/try: cb864899df68ddc396cc63e63cdcbc22c58b930d
+refs/heads/try: dbb0d5d39772eff1992a974b8ca4d2d41f5bbf6a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/ext/expand.rs

@@ -1794,13 +1794,13 @@ mod test {
                 // create a really evil test case where a $x appears inside a binding of $x
                 // but *shouldnt* bind because it was inserted by a different macro....
             ];
-        for s in tests.iter() {
-            run_renaming_test(s);
+        for (idx,s) in tests.iter().enumerate() {
+            run_renaming_test(s,idx);
         }
     }
 
     // run one of the renaming tests
-    fn run_renaming_test(t : &renaming_test) {
+    fn run_renaming_test(t : &renaming_test, test_idx: uint) {
         let invalid_name = token::special_idents::invalid.name;
         let (teststr, bound_connections, bound_ident_check) = match *t {
             (ref str,ref conns, bic) => (str.to_managed(), conns.clone(), bic)
@@ -1845,8 +1845,15 @@ mod test {
                         && (mtwt_resolve(varref.segments[0].identifier) == binding_name);
                     // temp debugging:
                     if (fail) {
-                        std::io::println("uh oh, matches but shouldn't:");
+                        println!("failure on test {}",test_idx);
+                        println!("text of test case: \"{}\"", teststr);
+                        println!("");
+                        println!("uh oh, matches but shouldn't:");
                         std::io::println(fmt!("varref: %?",varref));
+                        // good lord, you can't make a path with 0 segments, can you?
+                        println!("varref's first segment's uint: {}, and string: \"{}\"",
+                                 varref.segments[0].identifier.name,
+                                 ident_to_str(&varref.segments[0].identifier));
                         std::io::println(fmt!("binding: %?", bindings[binding_idx]));
                         ast_util::display_sctable(get_sctable());
                     }