diff options
| author | bors <bors@rust-lang.org> | 2014-02-06 08:06:33 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-06 08:06:33 -0800 |
| commit | f039d10cf73d8bc9a57fcdfe38c5f0b0a3a98b5a (patch) | |
| tree | 745138c6ee6d8053b148d3b803dd9d0f54fd8a78 /src/libsyntax/ext | |
| parent | 27dcd873cb63ddf2057cbae341be9ccae7b011c3 (diff) | |
| parent | 5719ff73bfe2f9ed769ad3f454407aac6a727444 (diff) | |
| download | rust-f039d10cf73d8bc9a57fcdfe38c5f0b0a3a98b5a.tar.gz rust-f039d10cf73d8bc9a57fcdfe38c5f0b0a3a98b5a.zip | |
auto merge of #12048 : sanxiyn/rust/crate-config, r=alexcrichton
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index ae93c235ad2..76aa0e981bd 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -800,9 +800,8 @@ impl<'a> Folder for MacroExpander<'a> { pub fn expand_crate(parse_sess: @parse::ParseSess, loader: &mut CrateLoader, - cfg: ast::CrateConfig, c: Crate) -> Crate { - let mut cx = ExtCtxt::new(parse_sess, cfg.clone(), loader); + let mut cx = ExtCtxt::new(parse_sess, c.config.clone(), loader); let mut expander = MacroExpander { extsbox: syntax_expander_table(), cx: &mut cx, @@ -1033,7 +1032,7 @@ mod test { ~[],sess); // should fail: let mut loader = ErrLoader; - expand_crate(sess,&mut loader,~[],crate_ast); + expand_crate(sess,&mut loader,crate_ast); } // make sure that macros can leave scope for modules @@ -1048,7 +1047,7 @@ mod test { ~[],sess); // should fail: let mut loader = ErrLoader; - expand_crate(sess,&mut loader,~[],crate_ast); + expand_crate(sess,&mut loader,crate_ast); } // macro_escape modules shouldn't cause macros to leave scope @@ -1062,7 +1061,7 @@ mod test { ~[], sess); // should fail: let mut loader = ErrLoader; - expand_crate(sess, &mut loader, ~[], crate_ast); + expand_crate(sess, &mut loader, crate_ast); } #[test] fn test_contains_flatten (){ @@ -1135,7 +1134,7 @@ mod test { let (crate_ast,ps) = string_to_crate_and_sess(crate_str); // the cfg argument actually does matter, here... let mut loader = ErrLoader; - expand_crate(ps,&mut loader,~[],crate_ast) + expand_crate(ps,&mut loader,crate_ast) } //fn expand_and_resolve(crate_str: @str) -> ast::crate { |