---

yaml
---
r: 79243
b: refs/heads/auto
c: 62fee04
h: refs/heads/master
i:
  79241: 6789f99
  79239: 4403aac
v: v3

Author: jbclements

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1f8e8564308917efe94663d3577bfe35948b624a
+refs/heads/auto: 62fee04ae9f82c1d1fe03c68735ee2b9f69f9b8e
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

@@ -1480,6 +1480,8 @@ mod test {
         let teststrs =
             ~[// b & c should get new names throughout, in the expr too:
                 @"fn a() -> int { let b = 13; let c = b; b+c }",
+                // both x's should be renamed (how is this causing a bug?)
+                @"fn main () {let x : int = 13;x;}",
                 // the use of b before the + should be renamed, the other one not:
                 @"macro_rules! f (($x:ident) => ($x + b)) fn a() -> int { let b = 13; f!(b)}",
                 // the b before the plus should not be renamed (requires marks)
@@ -1508,8 +1510,4 @@ mod test {
         assert_eq!(idents, @mut strs_to_idents(~["a","c","b","d"]));
     }
 
-/*    #[test]
-    fn debugging(){
-        io::println(fmt!("%?",expand_and_resolve(@~"fn main () {    let x : int = 13;}")))
-    }*/
 }