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

Do not include attributes in trait item spans.

Browse source 
(And other kinds of items).
This commit is contained in:
Nick Cameron 2015-04-24 08:45:32 +12:00
parent 6b29a7d564
commit 17934e5c29
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1151,8 +1151,8 @@ impl<'a> Parser<'a> {
&token::CloseDelim(token::Brace), &token::CloseDelim(token::Brace),
seq_sep_none(), seq_sep_none(),
|p| { |p| {
let lo = p.span.lo;
let mut attrs = p.parse_outer_attributes(); let mut attrs = p.parse_outer_attributes();
let lo = p.span.lo;
let (name, node) = if try!(p.eat_keyword(keywords::Type)) { let (name, node) = if try!(p.eat_keyword(keywords::Type)) {
let TyParam {ident, bounds, default, ..} = try!(p.parse_ty_param()); let TyParam {ident, bounds, default, ..} = try!(p.parse_ty_param());
@ -3409,8 +3409,8 @@ impl<'a> Parser<'a> {
} }
} }
let lo = self.span.lo;
let attrs = self.parse_outer_attributes(); let attrs = self.parse_outer_attributes();
let lo = self.span.lo;
Ok(Some(if self.check_keyword(keywords::Let) { Ok(Some(if self.check_keyword(keywords::Let) {
check_expected_item(self, &attrs); check_expected_item(self, &attrs);
@ -4304,8 +4304,8 @@ impl<'a> Parser<'a> {
/// Parse an impl item. /// Parse an impl item.
pub fn parse_impl_item(&mut self) -> PResult<P<ImplItem>> { pub fn parse_impl_item(&mut self) -> PResult<P<ImplItem>> {
let lo = self.span.lo;
let mut attrs = self.parse_outer_attributes(); let mut attrs = self.parse_outer_attributes();
let lo = self.span.lo;
let vis = try!(self.parse_visibility()); let vis = try!(self.parse_visibility());
let (name, node) = if try!(self.eat_keyword(keywords::Type)) { let (name, node) = if try!(self.eat_keyword(keywords::Type)) {
let name = try!(self.parse_ident()); let name = try!(self.parse_ident());
@ -5380,9 +5380,8 @@ impl<'a> Parser<'a> {
/// Parse a foreign item. /// Parse a foreign item.
fn parse_foreign_item(&mut self) -> PResult<Option<P<ForeignItem>>> { fn parse_foreign_item(&mut self) -> PResult<Option<P<ForeignItem>>> {
let lo = self.span.lo;
let attrs = self.parse_outer_attributes(); let attrs = self.parse_outer_attributes();
let lo = self.span.lo;
let visibility = try!(self.parse_visibility()); let visibility = try!(self.parse_visibility());
if self.check_keyword(keywords::Static) { if self.check_keyword(keywords::Static) {