diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2014-06-13 09:36:26 +1000 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-13 13:53:55 -0700 |
| commit | 9d5ec04d184a5d28e75d74b725ebb7cc21b547af (patch) | |
| tree | 31d9414a1aa4f9d705606fd708bdf334aa17e5b0 | |
| parent | c9f3f47702602d196de414aa4f10bb2c2148ab9a (diff) | |
| download | rust-9d5ec04d184a5d28e75d74b725ebb7cc21b547af.tar.gz rust-9d5ec04d184a5d28e75d74b725ebb7cc21b547af.zip | |
syntax: fix quote_pat! & unignore a quotation test.
| -rw-r--r-- | src/libsyntax/ext/quote.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass-fulldeps/quote-tokens.rs | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 185924f704c..bc5442a94fb 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -368,9 +368,7 @@ pub fn expand_quote_pat(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> Box<base::MacResult> { - let e_refutable = cx.expr_lit(sp, ast::LitBool(true)); - let expanded = expand_parse_call(cx, sp, "parse_pat", - vec!(e_refutable), tts); + let expanded = expand_parse_call(cx, sp, "parse_pat", vec!(), tts); base::MacExpr::new(expanded) } diff --git a/src/test/run-pass-fulldeps/quote-tokens.rs b/src/test/run-pass-fulldeps/quote-tokens.rs index 7c25246807d..c41ec0dbd65 100644 --- a/src/test/run-pass-fulldeps/quote-tokens.rs +++ b/src/test/run-pass-fulldeps/quote-tokens.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-test - #![feature(quote)] #![feature(managed_boxes)] @@ -18,11 +16,11 @@ extern crate syntax; use syntax::ext::base::ExtCtxt; fn syntax_extension(cx: &ExtCtxt) { - let e_toks : Vec<syntax::ast::token_tree> = quote_tokens!(cx, 1 + 2); - let p_toks : Vec<syntax::ast::token_tree> = quote_tokens!(cx, (x, 1 .. 4, *)); + let e_toks : Vec<syntax::ast::TokenTree> = quote_tokens!(cx, 1 + 2); + let p_toks : Vec<syntax::ast::TokenTree> = quote_tokens!(cx, (x, 1 .. 4, *)); let a: @syntax::ast::Expr = quote_expr!(cx, 1 + 2); - let _b: Option<@syntax::ast::item> = quote_item!(cx, static foo : int = $e_toks; ); + let _b: Option<@syntax::ast::Item> = quote_item!(cx, static foo : int = $e_toks; ); let _c: @syntax::ast::Pat = quote_pat!(cx, (x, 1 .. 4, *) ); let _d: @syntax::ast::Stmt = quote_stmt!(cx, let x = $a; ); let _e: @syntax::ast::Expr = quote_expr!(cx, match foo { $p_toks => 10 } ); |
