diff options
| author | bors <bors@rust-lang.org> | 2014-12-19 20:22:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-19 20:22:17 +0000 |
| commit | cbe9fb45bc705a89f23b434c686544d490923596 (patch) | |
| tree | ce3e8cc2156b5e01a020a8cb192c6e74068fdd67 | |
| parent | 95c2ed31aeb66b2662933200dbfd661a573b1f49 (diff) | |
| parent | 8920181052c8b66bcc73d0552bbd5fafc8b41378 (diff) | |
| download | rust-cbe9fb45bc705a89f23b434c686544d490923596.tar.gz rust-cbe9fb45bc705a89f23b434c686544d490923596.zip | |
auto merge of #19463 : kali/rust/master, r=alexcrichton
parse_ty() no longer takes a boolean parameter. quote_ty! implementation has not yet been modified accordingly. As a matter of fact, quote_ty! was not covered by tests. One test (called qquotes) references it, but it has been ignored for nearly one year and now need heavy refactoring. quote_token.rs seemed like a good place to test quote_ty!, many other quote_*! macros were asserted there.
| -rw-r--r-- | src/libsyntax/ext/quote.rs | 3 | ||||
| -rw-r--r-- | src/test/run-pass-fulldeps/quote-tokens.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 14e13feac98..c7cb41e2ece 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -450,8 +450,7 @@ pub fn expand_quote_ty(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> Box<base::MacResult+'static> { - let expanded = expand_parse_call(cx, sp, "parse_ty", - vec![], tts); + let expanded = expand_parse_call(cx, sp, "parse_ty", 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 8a640387da2..dc14e3c707c 100644 --- a/src/test/run-pass-fulldeps/quote-tokens.rs +++ b/src/test/run-pass-fulldeps/quote-tokens.rs @@ -38,6 +38,8 @@ fn syntax_extension(cx: &ExtCtxt) { let _j: P<syntax::ast::Method> = quote_method!(cx, fn foo(&self) {}); let _k: P<syntax::ast::Method> = quote_method!(cx, #[doc = "hello"] fn foo(&self) {}); + + let _l: P<syntax::ast::Ty> = quote_ty!(cx, &int); } fn main() { |