bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

auto merge of #18141 : phildawes/rust/master, r=brson

Browse source 
Hello! I noticed spans are wrong for the PatIdents of self args. (I use spans a lot in racer)
This commit is contained in:
bors 2014-10-22 07:07:09 +00:00
commit 7088c45ef4
2 changed files with 49 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libsyntax/parse/parser.rs
View file

@ -4165,10 +4165,16 @@ impl<'a> Parser<'a> {
// A bit of complexity and lookahead is needed here in order to be
// backwards compatible.
let lo = self.span.lo;
let mut self_ident_lo = self.span.lo;
let mut self_ident_hi = self.span.hi;
let mut mutbl_self = MutImmutable;
let explicit_self = match self.token {
token::BINOP(token::AND) => {
maybe_parse_borrowed_explicit_self(self)
let eself = maybe_parse_borrowed_explicit_self(self);
self_ident_lo = self.last_span.lo;
self_ident_hi = self.last_span.hi;
eself
}
token::TILDE => {
// We need to make sure it isn't a type
@ -4240,7 +4246,7 @@ impl<'a> Parser<'a> {
_ => SelfStatic,
};
let explicit_self_sp = mk_sp(lo, self.span.hi);
let explicit_self_sp = mk_sp(self_ident_lo, self_ident_hi);
// shared fall-through for the three cases below. borrowing prevents simply
// writing this as a closure