---

yaml
---
r: 54259
b: refs/heads/dist-snap
c: 09dc38e
h: refs/heads/master
i:
  54257: 82cc12c
  54255: e4979bd
v: v3

Author: bors

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: b1c0a6628beb612f3d847ab088e74da639f6ca7b
+refs/heads/dist-snap: 09dc38eda54537c0c10b8a89852c714e3e14f57a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libsyntax/parse/parser.rs

@@ -3207,6 +3207,10 @@ pub impl Parser {
                   }
                 }
             }
+            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.

branches/dist-snap/src/test/compile-fail/block-must-not-have-result-res.rs

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

branches/dist-snap/src/test/compile-fail/obsolete-syntax.rs

@@ -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: ()

branches/dist-snap/src/test/compile-fail/struct-no-fields.rs

@@ -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() {}