From 968089e4228ef9c3caab0ce6e327356757cb52c1 Mon Sep 17 00:00:00 2001 From: John Clements <clements@racket-lang.org> Date: Fri, 19 Apr 2013 10:36:21 -0700 Subject: [PATCH] rename parse_class_item to parse_struct_decl_field two problems with the old name: they're not called classes any more, and the word "item" has a specific connotation in the parser --- src/libsyntax/parse/parser.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 880c431e15c..97ceb6f87a8 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3238,7 +3238,7 @@ pub impl Parser { is_tuple_like = false; fields = ~[]; while *self.token != token::RBRACE { - match self.parse_class_item() { + match self.parse_struct_decl_field() { dtor_decl(ref blk, ref attrs, s) => { match the_dtor { Some((_, _, s_first)) => { @@ -3355,7 +3355,8 @@ pub impl Parser { dtor_decl(body, attrs, mk_sp(lo, self.last_span.hi)) } - fn parse_class_item(&self) -> class_contents { + // parse an item in a struct definition + fn parse_struct_decl_field(&self) -> class_contents { if self.try_parse_obsolete_priv_section() { return members(~[]); @@ -3759,7 +3760,7 @@ pub impl Parser { let mut the_dtor: Option<(blk, ~[attribute], codemap::span)> = None; let mut fields: ~[@struct_field] = ~[]; while *self.token != token::RBRACE { - match self.parse_class_item() { + match self.parse_struct_decl_field() { dtor_decl(ref blk, ref attrs, s) => { match the_dtor { Some((_, _, s_first)) => {