diff options
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 5c95c369f94..98479d65cbb 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1232,7 +1232,8 @@ impl<'a> Parser<'a> { { if self.eat(&token::Lt) { if lifetime_defs.is_empty() { - self.warn("deprecated syntax, use `for` keyword now"); + self.warn("deprecated syntax; use the `for` keyword now \ + (e.g. change `fn<'a>` to `for<'a> fn`)"); let lifetime_defs = self.parse_lifetime_defs(); self.expect_gt(); lifetime_defs @@ -5178,7 +5179,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( |