diff options
| author | bors <bors@rust-lang.org> | 2014-05-07 05:16:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-07 05:16:48 -0700 |
| commit | ef6daf9935da103f1b915a5c9904794da79b0b60 (patch) | |
| tree | ad9695f06d85962039a8f90ac741726b345096aa /src/libfourcc | |
| parent | 4a5d39001b1da84fe4be2996a2c7d894d5c248c6 (diff) | |
| parent | 090040bf4037a094e50b03d79e4baf5cd89c912b (diff) | |
| download | rust-ef6daf9935da103f1b915a5c9904794da79b0b60.tar.gz rust-ef6daf9935da103f1b915a5c9904794da79b0b60.zip | |
auto merge of #13958 : pcwalton/rust/detilde, r=pcwalton
for `~str`/`~[]`. Note that `~self` still remains, since I forgot to add support for `Box<self>` before the snapshot. r? @brson or @alexcrichton or whoever
Diffstat (limited to 'src/libfourcc')
| -rw-r--r-- | src/libfourcc/lib.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libfourcc/lib.rs b/src/libfourcc/lib.rs index 04fa139168f..34ff35a3ad6 100644 --- a/src/libfourcc/lib.rs +++ b/src/libfourcc/lib.rs @@ -66,14 +66,15 @@ use syntax::parse::token::InternedString; #[macro_registrar] pub fn macro_registrar(register: |Name, SyntaxExtension|) { register(token::intern("fourcc"), - NormalTT(~BasicMacroExpander { + NormalTT(box BasicMacroExpander { expander: expand_syntax_ext, span: None, }, None)); } -pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> ~base::MacResult { +pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) + -> Box<base::MacResult> { let (expr, endian) = parse_tts(cx, tts); let little = match endian { |