---

yaml
---
r: 129891
b: refs/heads/auto
c: d3d14d6
h: refs/heads/master
i:
  129889: f6cb4a0
  129887: 0a920d3
v: v3

Author: wickerwaka

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: f5776f81fd69cfe73de2806b31ef04215501fb0c
+refs/heads/auto: d3d14d6a41141c4780b9d0ddcdfa3748036de570
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/typeck/check/mod.rs

@@ -4000,7 +4000,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt,
             }
             Some(def::DefTrait(def_id)) => {
                 span_err!(tcx.sess, path.span, E0159,
-                    "`{}` is a trait not a structure",
+                    "use of trait `{}` as a struct constructor",
                     pprust::path_to_string(path));
                 check_struct_fields_on_error(fcx,
                                              id,

branches/auto/src/test/compile-fail/trait-as-struct-constructor.rs

@@ -0,0 +1,17 @@
+// Copyright 2014 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.
+
+trait TraitNotAStruct { }
+
+fn main() {
+    TraitNotAStruct{ value: 0 };
+    //~^ ERROR: use of trait `TraitNotAStruct` as a struct constructor [E0159]
+}
+