mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #24685 - nrc:span-pred, r=huonw

Browse Source
This commit is contained in:
bors 2015-04-22 08:47:09 +00:00
commit e9e9279d87
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsyntax/parse/parser.rs
View File

@ -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 {