diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 94b5cf46dd1..c579a2c9c0a 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -867,8 +867,8 @@ impl<'a, 'v> Visitor<'v> for PostExpansionVisitor<'a> { self.context.span_handler.span_err(span, "empty tuple structs and enum variants \ are not allowed, use unit structs and \ enum variants instead"); - self.context.span_handler.span_help(span, "remove trailing () to make a unit \ - struct or unit enum varian"); + self.context.span_handler.span_help(span, "remove trailing `()` to make a unit \ + struct or unit enum variant"); } } visit::walk_struct_def(self, s) diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 0a75d05f2cc..fde1058a785 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -113,6 +113,13 @@ pub enum BoundParsingMode { Modified, } +/// `pub` should be parsed in struct fields and not parsed in variant fields +#[derive(Clone, Copy, PartialEq)] +pub enum ParsePub { + Yes, + No, +} + /// Possibly accept an `token::Interpolated` expression (a pre-parsed expression /// dropped into the token stream, which happens while parsing the result of /// macro expansion). Placement of these is not as complex as I feared it would @@ -4686,17 +4693,19 @@ impl<'a> Parser<'a> { VariantData::Unit(ast::DUMMY_NODE_ID) } else { // If we see: `struct Foo where T: Copy { ... }` - VariantData::Struct(try!(self.parse_record_struct_body(true)), ast::DUMMY_NODE_ID) + VariantData::Struct(try!(self.parse_record_struct_body(ParsePub::Yes)), + ast::DUMMY_NODE_ID) } // No `where` so: `struct Foo;` } else if try!(self.eat(&token::Semi) ){ VariantData::Unit(ast::DUMMY_NODE_ID) // Record-style struct definition } else if self.token == token::OpenDelim(token::Brace) { - VariantData::Struct(try!(self.parse_record_struct_body(true)), ast::DUMMY_NODE_ID) + VariantData::Struct(try!(self.parse_record_struct_body(ParsePub::Yes)), + ast::DUMMY_NODE_ID) // Tuple-style struct definition with optional where-clause. } else if self.token == token::OpenDelim(token::Paren) { - let body = VariantData::Tuple(try!(self.parse_tuple_struct_body(true)), + let body = VariantData::Tuple(try!(self.parse_tuple_struct_body(ParsePub::Yes)), ast::DUMMY_NODE_ID); generics.where_clause = try!(self.parse_where_clause()); try!(self.expect(&token::Semi)); @@ -4710,11 +4719,11 @@ impl<'a> Parser<'a> { Ok((class_name, ItemStruct(vdata, generics), None)) } - pub fn parse_record_struct_body(&mut self, allow_pub: bool) -> PResult> { + pub fn parse_record_struct_body(&mut self, parse_pub: ParsePub) -> PResult> { let mut fields = Vec::new(); if try!(self.eat(&token::OpenDelim(token::Brace)) ){ while self.token != token::CloseDelim(token::Brace) { - fields.push(try!(self.parse_struct_decl_field(allow_pub))); + fields.push(try!(self.parse_struct_decl_field(parse_pub))); } try!(self.bump()); @@ -4728,7 +4737,7 @@ impl<'a> Parser<'a> { Ok(fields) } - pub fn parse_tuple_struct_body(&mut self, allow_pub: bool) -> PResult> { + pub fn parse_tuple_struct_body(&mut self, parse_pub: ParsePub) -> PResult> { // This is the case where we find `struct Foo(T) where T: Copy;` // Unit like structs are handled in parse_item_struct function let fields = try!(self.parse_unspanned_seq( @@ -4740,7 +4749,11 @@ impl<'a> Parser<'a> { let lo = p.span.lo; let struct_field_ = ast::StructField_ { kind: UnnamedField ( - if allow_pub { try!(p.parse_visibility()) } else { Inherited } + if parse_pub == ParsePub::Yes { + try!(p.parse_visibility()) + } else { + Inherited + } ), id: ast::DUMMY_NODE_ID, ty: try!(p.parse_ty_sum()), @@ -4776,12 +4789,12 @@ impl<'a> Parser<'a> { } /// Parse an element of a struct definition - fn parse_struct_decl_field(&mut self, allow_pub: bool) -> PResult { + fn parse_struct_decl_field(&mut self, parse_pub: ParsePub) -> PResult { let attrs = try!(self.parse_outer_attributes()); if try!(self.eat_keyword(keywords::Pub) ){ - if !allow_pub { + if parse_pub == ParsePub::No { let span = self.last_span; self.span_err(span, "`pub` is not allowed here"); } @@ -5149,11 +5162,11 @@ impl<'a> Parser<'a> { if self.check(&token::OpenDelim(token::Brace)) { // Parse a struct variant. all_nullary = false; - struct_def = VariantData::Struct(try!(self.parse_record_struct_body(false)), + struct_def = VariantData::Struct(try!(self.parse_record_struct_body(ParsePub::No)), ast::DUMMY_NODE_ID); } else if self.check(&token::OpenDelim(token::Paren)) { all_nullary = false; - struct_def = VariantData::Tuple(try!(self.parse_tuple_struct_body(false)), + struct_def = VariantData::Tuple(try!(self.parse_tuple_struct_body(ParsePub::No)), ast::DUMMY_NODE_ID); } else if try!(self.eat(&token::Eq) ){ disr_expr = Some(try!(self.parse_expr_nopanic())); diff --git a/src/test/compile-fail/issue-12560-1.rs b/src/test/compile-fail/issue-12560-1.rs index d0fb91a576c..e005de01649 100644 --- a/src/test/compile-fail/issue-12560-1.rs +++ b/src/test/compile-fail/issue-12560-1.rs @@ -14,9 +14,9 @@ enum Foo { Bar(), //~ ERROR empty tuple structs and enum variants are not allowed - //~^ HELP remove trailing () to make a unit struct or unit enum varian + //~^ HELP remove trailing `()` to make a unit struct or unit enum variant Baz(), //~ ERROR empty tuple structs and enum variants are not allowed - //~^ HELP remove trailing () to make a unit struct or unit enum varian + //~^ HELP remove trailing `()` to make a unit struct or unit enum variant Bazar }