From 8000482e86808f7e36b8d7e595cea7c712d09a6c Mon Sep 17 00:00:00 2001 From: Tom Jakubowski Date: Sun, 16 Nov 2014 18:13:21 -0800 Subject: Disallow parsing of struct variants with 0 fields Make struct variant syntax more consistent with struct syntax and fix an assert in middle::typeck. Fix #19003 --- src/libsyntax/parse/parser.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/libsyntax/parse/parser.rs') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 50e3483fb15..44b7cc8d181 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -5175,7 +5175,15 @@ impl<'a> Parser<'a> { if self.eat(&token::OpenDelim(token::Brace)) { // Parse a struct variant. all_nullary = false; - kind = StructVariantKind(self.parse_struct_def()); + let start_span = self.span; + let struct_def = self.parse_struct_def(); + if struct_def.fields.len() == 0 { + self.span_err(start_span, + format!("unit-like struct variant should be written \ + without braces, as `{},`", + token::get_ident(ident)).as_slice()); + } + kind = StructVariantKind(struct_def); } else if self.token == token::OpenDelim(token::Paren) { all_nullary = false; let arg_tys = self.parse_enum_variant_seq( -- cgit 1.4.1-3-g733a5