---

yaml
---
r: 79244
b: refs/heads/auto
c: 015ba31
h: refs/heads/master
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: 62fee04ae9f82c1d1fe03c68735ee2b9f69f9b8e
+refs/heads/auto: 015ba31c02b912220a9b7323e1a6ae3bad4ab927
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

@@ -1462,10 +1462,14 @@ mod test {
         pprust::print_mod(s, &crate.module, crate.attrs);
     }
 
-    //fn expand_and_resolve(crate_str: @str) -> ast::crate {
-        //let (crate_ast,ps) = string_to_crate_and_sess(crate_str);
+    fn expand_crate_str(crate_str: @str) -> @ast::Crate {
+        let (crate_ast,ps) = string_to_crate_and_sess(crate_str);
         // the cfg argument actually does matter, here...
-        //let expanded_ast = expand_crate(ps,~[],crate_ast);
+        expand_crate(ps,~[],crate_ast)
+    }
+
+    //fn expand_and_resolve(crate_str: @str) -> ast::crate {
+        //let expanded_ast = expand_crate_str(crate_str);
         // std::io::println(fmt!("expanded: %?\n",expanded_ast));
         //mtwt_resolve_crate(expanded_ast)
     //}