user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/incoming' into incoming

Browse source
This commit is contained in:
Erick Tryzelaar 2013-03-02 07:12:53 -08:00
commit 5515fd5c8c
58 changed files with 520 additions and 593 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libsyntax/ext/fmt.rs
View file

@ -24,7 +24,7 @@ use ext::base::*;
use ext::base;
use ext::build;
use ext::build::*;
use private::extfmt::ct::*;
use unstable::extfmt::ct::*;
pub fn expand_syntax_ext(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
-> base::MacResult {
@ -57,7 +57,7 @@ fn pieces_to_expr(cx: ext_ctxt, sp: span,
-> @ast::expr {
fn make_path_vec(cx: ext_ctxt, ident: @~str) -> ~[ast::ident] {
let intr = cx.parse_sess().interner;
return ~[intr.intern(@~"private"), intr.intern(@~"extfmt"),
return ~[intr.intern(@~"unstable"), intr.intern(@~"extfmt"),
intr.intern(@~"rt"), intr.intern(ident)];
}
fn make_rt_path_expr(cx: ext_ctxt, sp: span, nm: @~str) -> @ast::expr {