Skip to content

Commit bf98088

Browse files
huonwalexcrichton
authored andcommitted
---
yaml --- r: 152503 b: refs/heads/try2 c: 9d5ec04 h: refs/heads/master i: 152501: b98d4f2 152499: 74ece79 152495: a9dabad v: v3
1 parent 9475b42 commit bf98088

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: c9f3f47702602d196de414aa4f10bb2c2148ab9a
8+
refs/heads/try2: 9d5ec04d184a5d28e75d74b725ebb7cc21b547af
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/ext/quote.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,7 @@ pub fn expand_quote_pat(cx: &mut ExtCtxt,
368368
sp: Span,
369369
tts: &[ast::TokenTree])
370370
-> Box<base::MacResult> {
371-
let e_refutable = cx.expr_lit(sp, ast::LitBool(true));
372-
let expanded = expand_parse_call(cx, sp, "parse_pat",
373-
vec!(e_refutable), tts);
371+
let expanded = expand_parse_call(cx, sp, "parse_pat", vec!(), tts);
374372
base::MacExpr::new(expanded)
375373
}
376374

branches/try2/src/test/run-pass-fulldeps/quote-tokens.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-test
12-
1311
#![feature(quote)]
1412
#![feature(managed_boxes)]
1513

@@ -18,11 +16,11 @@ extern crate syntax;
1816
use syntax::ext::base::ExtCtxt;
1917

2018
fn syntax_extension(cx: &ExtCtxt) {
21-
let e_toks : Vec<syntax::ast::token_tree> = quote_tokens!(cx, 1 + 2);
22-
let p_toks : Vec<syntax::ast::token_tree> = quote_tokens!(cx, (x, 1 .. 4, *));
19+
let e_toks : Vec<syntax::ast::TokenTree> = quote_tokens!(cx, 1 + 2);
20+
let p_toks : Vec<syntax::ast::TokenTree> = quote_tokens!(cx, (x, 1 .. 4, *));
2321

2422
let a: @syntax::ast::Expr = quote_expr!(cx, 1 + 2);
25-
let _b: Option<@syntax::ast::item> = quote_item!(cx, static foo : int = $e_toks; );
23+
let _b: Option<@syntax::ast::Item> = quote_item!(cx, static foo : int = $e_toks; );
2624
let _c: @syntax::ast::Pat = quote_pat!(cx, (x, 1 .. 4, *) );
2725
let _d: @syntax::ast::Stmt = quote_stmt!(cx, let x = $a; );
2826
let _e: @syntax::ast::Expr = quote_expr!(cx, match foo { $p_toks => 10 } );

0 commit comments

Comments
 (0)