about summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-02-16 00:46:43 +0000
committerbors <bors@rust-lang.org>2015-02-16 00:46:43 +0000
commitc5db290bf6df986a6acd5ce993f278c18e55ca37 (patch)
tree5a67ed2bb3601bc1d5f477057324421fbd2291c3 /src/libsyntax/ext
parent342ab53bf858a89e418973ba3bfff55161c0b174 (diff)
parentcea2bbfe27707becaacad1ce64b835b408c0ccf8 (diff)
downloadrust-c5db290bf6df986a6acd5ce993f278c18e55ca37.tar.gz
rust-c5db290bf6df986a6acd5ce993f278c18e55ca37.zip
Auto merge of #22367 - Manishearth:rollup, r=steveklabnik
(still testing locally)
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/tt/macro_rules.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs
index de61bdefa5d..f322cf8bad0 100644
--- a/src/libsyntax/ext/tt/macro_rules.rs
+++ b/src/libsyntax/ext/tt/macro_rules.rs
@@ -89,8 +89,7 @@ impl<'a> MacResult for ParserAnyMacro<'a> {
             match parser.token {
                 token::Eof => break,
                 _ => {
-                    let attrs = parser.parse_outer_attributes();
-                    ret.push(parser.parse_method(attrs, ast::Inherited))
+                    ret.push(parser.parse_method_with_outer_attributes());
                 }
             }
         }