diff options
| author | Philipp Brüschweiler <blei42@gmail.com> | 2013-11-30 17:27:25 +0100 |
|---|---|---|
| committer | Philipp Brüschweiler <blei42@gmail.com> | 2013-12-01 11:24:58 +0100 |
| commit | 47ce9819033d235715474f8ea0420a5610855f7f (patch) | |
| tree | 2adf0f3ef0fcc02a9b49246a054d30c9e0048bf0 /src/libsyntax/parse/parser.rs | |
| parent | c470184c20167f9f41613d5f4a1d75840e0f5c3a (diff) | |
| download | rust-47ce9819033d235715474f8ea0420a5610855f7f.tar.gz rust-47ce9819033d235715474f8ea0420a5610855f7f.zip | |
ast: Remove one `@` and fix the fallout
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 8263906d925..dba47386bba 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3162,7 +3162,7 @@ impl Parser { // parse a structure field fn parse_name_and_ty(&self, pr: visibility, - attrs: ~[Attribute]) -> @struct_field { + attrs: ~[Attribute]) -> struct_field { let lo = self.span.lo; if !is_plain_ident(&*self.token) { self.fatal("expected ident"); @@ -3170,7 +3170,7 @@ impl Parser { let name = self.parse_ident(); self.expect(&token::COLON); let ty = self.parse_ty(false); - @spanned(lo, self.last_span.hi, ast::struct_field_ { + spanned(lo, self.last_span.hi, ast::struct_field_ { kind: named_field(name, pr), id: ast::DUMMY_NODE_ID, ty: ty, @@ -4006,7 +4006,7 @@ impl Parser { let class_name = self.parse_ident(); let generics = self.parse_generics(); - let mut fields: ~[@struct_field]; + let mut fields: ~[struct_field]; let is_tuple_like; if self.eat(&token::LBRACE) { @@ -4037,7 +4037,7 @@ impl Parser { ty: p.parse_ty(false), attrs: attrs, }; - @spanned(lo, p.span.hi, struct_field_) + spanned(lo, p.span.hi, struct_field_) }); self.expect(&token::SEMI); } else if self.eat(&token::SEMI) { @@ -4075,7 +4075,7 @@ impl Parser { pub fn parse_single_struct_field(&self, vis: visibility, attrs: ~[Attribute]) - -> @struct_field { + -> struct_field { let a_var = self.parse_name_and_ty(vis, attrs); match *self.token { token::COMMA => { @@ -4092,7 +4092,7 @@ impl Parser { } // parse an element of a struct definition - fn parse_struct_decl_field(&self) -> @struct_field { + fn parse_struct_decl_field(&self) -> struct_field { let attrs = self.parse_outer_attributes(); @@ -4454,7 +4454,7 @@ impl Parser { // parse a structure-like enum variant definition // this should probably be renamed or refactored... fn parse_struct_def(&self) -> @struct_def { - let mut fields: ~[@struct_field] = ~[]; + let mut fields: ~[struct_field] = ~[]; while *self.token != token::RBRACE { fields.push(self.parse_struct_decl_field()); } |
