about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-04-22 08:47:09 +0000
committerbors <bors@rust-lang.org>2015-04-22 08:47:09 +0000
commite9e9279d87d5786fcb8e12482f2920979602267b (patch)
tree8ca3f9b03497801079d2b5365957134e5df0e8fc /src/libsyntax/parse
parent50cd2e84d5d0c73a4dcda291b898c1f8ae0ddc8c (diff)
parent8456dba4e65456cd7817864f23c8787c0494ab23 (diff)
downloadrust-e9e9279d87d5786fcb8e12482f2920979602267b.tar.gz
rust-e9e9279d87d5786fcb8e12482f2920979602267b.zip
Auto merge of #24685 - nrc:span-pred, r=huonw
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 796bc2a3513..78854412bf8 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3888,7 +3888,7 @@ impl<'a> Parser<'a> {
                     let bounds =
                         try!(self.parse_lifetimes(token::BinOp(token::Plus)));
 
-                    let hi = self.span.hi;
+                    let hi = self.last_span.hi;
                     let span = mk_sp(lo, hi);
 
                     where_clause.predicates.push(ast::WherePredicate::RegionPredicate(
@@ -3917,7 +3917,7 @@ impl<'a> Parser<'a> {
 
                     if try!(self.eat(&token::Colon) ){
                         let bounds = try!(self.parse_ty_param_bounds(BoundParsingMode::Bare));
-                        let hi = self.span.hi;
+                        let hi = self.last_span.hi;
                         let span = mk_sp(lo, hi);
 
                         if bounds.is_empty() {
@@ -3937,7 +3937,7 @@ impl<'a> Parser<'a> {
                         parsed_something = true;
                     } else if try!(self.eat(&token::Eq) ){
                         // let ty = try!(self.parse_ty_nopanic());
-                        let hi = self.span.hi;
+                        let hi = self.last_span.hi;
                         let span = mk_sp(lo, hi);
                         // where_clause.predicates.push(
                         //     ast::WherePredicate::EqPredicate(ast::WhereEqPredicate {