about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2013-03-26 21:26:29 -0700
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2013-03-27 07:04:14 -0700
commitb26ae289d0c69350742daa9cadb1c099d2ec3816 (patch)
tree7d9fc10efa5637bf1611ae626d971b153b11b0c0 /src/libsyntax/parse
parent4e9a63ff917af32bd9ddfee65f5871a5586771e1 (diff)
downloadrust-b26ae289d0c69350742daa9cadb1c099d2ec3816.tar.gz
rust-b26ae289d0c69350742daa9cadb1c099d2ec3816.zip
syntax: Fix parsing global generics (Closes #5572)
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 53d618e3340..4a84a31dd55 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2728,8 +2728,9 @@ pub impl Parser {
                     }
                     self.bump();
                 }
-                token::IDENT(*) => {
+                token::MOD_SEP | token::IDENT(*) => {
                     let maybe_bound = match *self.token {
+                        token::MOD_SEP => None,
                         token::IDENT(copy sid, _) => {
                             match *self.id_to_str(sid) {
                                 ~"send" |
@@ -2757,7 +2758,7 @@ pub impl Parser {
                             result.push(bound);
                         }
                         None => {
-                            let ty = self.parse_ty(false);
+                            let ty = self.parse_ty(true);
                             result.push(TraitTyParamBound(ty));
                         }
                     }