auto merge of #5596 : luqmana/rust/unit-struct, r=catamorphism

Fixes #5449.
This commit is contained in:
bors 2013-03-28 06:12:47 -07:00
commit 09dc38eda5
4 changed files with 21 additions and 1 deletions

View file

@ -3207,6 +3207,10 @@ fn parse_item_struct(&self) -> item_info {
}
}
}
if fields.len() == 0 {
self.fatal(fmt!("Unit-like struct should be written as: struct %s;",
*self.interner.get(class_name)));
}
self.bump();
} else if *self.token == token::LPAREN {
// It's a tuple-like struct.

View file

@ -10,7 +10,7 @@
// error-pattern:mismatched types: expected `()` but found `bool`
struct r {}
struct r;
impl Drop for r {
fn finalize(&self) {

View file

@ -31,9 +31,11 @@ struct s {
struct q : r {
//~^ ERROR obsolete syntax: class traits
foo: int
}
struct sss {
bar: int,
priv {
//~^ ERROR obsolete syntax: private section
foo: ()

View file

@ -0,0 +1,14 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// error-pattern: Unit-like struct should be written as: struct Foo;
struct Foo {}
fn main() {}