about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-03-20 13:24:09 -0700
committerPatrick Walton <pcwalton@mimiga.net>2013-03-20 13:54:25 -0700
commit9c4d804cfe421d9a48ba2f0c6d12b7c654e75964 (patch)
treef8450f0cf9fe18b082df59105e5b25c2724410c5 /src/libsyntax/parse
parent0847d52a8677a39525b7cf7a09571851b6deb8b9 (diff)
downloadrust-9c4d804cfe421d9a48ba2f0c6d12b7c654e75964.tar.gz
rust-9c4d804cfe421d9a48ba2f0c6d12b7c654e75964.zip
libsyntax: Never use `::<>` in the type grammar
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 086bf86b4b2..de861075a5b 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -581,7 +581,9 @@ pub impl Parser {
         }
     }
 
-    fn parse_ty(&self, colons_before_params: bool) -> @Ty {
+    // Useless second parameter for compatibility with quasiquote macros.
+    // Bleh!
+    fn parse_ty(&self, _: bool) -> @Ty {
         maybe_whole!(self, nt_ty);
 
         let lo = self.span.lo;
@@ -661,7 +663,7 @@ pub impl Parser {
             result
         } else if *self.token == token::MOD_SEP
             || is_ident_or_path(&*self.token) {
-            let path = self.parse_path_with_tps(colons_before_params);
+            let path = self.parse_path_with_tps(false);
             ty_path(path, self.get_id())
         } else {
             self.fatal(~"expected type");