about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorJared Roesch <roeschinc@gmail.com>2014-12-20 02:48:43 -0800
committerJared Roesch <roeschinc@gmail.com>2014-12-20 03:54:39 -0800
commitd87b308b67ab070d67ab66062b33f64e5bc621e4 (patch)
tree13fa47333d28c9926b8a26718f355250ad20247d /src/libsyntax/parse
parente0cac488ac6ca16507da390429565b7879f76bb4 (diff)
downloadrust-d87b308b67ab070d67ab66062b33f64e5bc621e4.tar.gz
rust-d87b308b67ab070d67ab66062b33f64e5bc621e4.zip
Add support for multiple region bounds in where clauses
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 64bcf7dbdd1..f8b47e0405f 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -4199,9 +4199,8 @@ impl<'a> Parser<'a> {
 
                     self.eat(&token::Colon);
 
-                    // FIXME(#20049)
-                    let bounding_lifetime =
-                        self.parse_lifetime();
+                    let bounds =
+                        self.parse_lifetimes(token::BinOp(token::Plus));
 
                     let hi = self.span.hi;
                     let span = mk_sp(lo, hi);
@@ -4210,7 +4209,7 @@ impl<'a> Parser<'a> {
                         ast::WhereRegionPredicate {
                             span: span,
                             lifetime: bounded_lifetime,
-                            bound: bounding_lifetime
+                            bounds: bounds
                         }
                     ));