---

yaml
---
r: 93053
b: refs/heads/auto
c: 2d8fbba
h: refs/heads/master
i:
  93051: 9a3c9cc
v: v3

Author: brson

[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: 3b1862a82f04f8f5bcb197715d2ff506c6cdecc3
+refs/heads/auto: 2d8fbba57df502a47b2818405c6ab349b929142f
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

@@ -2765,6 +2765,16 @@ pub fn check_expr_with_unifier(fcx: @FnCtxt,
                         }
                         None => {
                             match *sty {
+                                ty::ty_struct(did, ref substs) if {
+                                    let fields = ty::struct_fields(fcx.tcx(), did, substs);
+                                    fields.len() == 1
+                                      && fields[0].ident == token::special_idents::unnamed_field
+                                } => {
+                                    // This is an obsolete struct deref
+                                    tcx.sess.span_err(
+                                        expr.span,
+                                        "single-field tuple-structs can no longer be dereferenced");
+                                }
                                 _ => {
                                     fcx.type_error_message(expr.span,
                                         |actual| {

branches/auto/src/test/compile-fail/obsolete-tuple-struct-deref.rs

@@ -0,0 +1,15 @@
+// Copyright 2013 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.
+
+fn main() {
+    struct S(int);
+    let s = S(0);
+    let x = *s; //~ ERROR single-field tuple-structs can no longer be dereferenced
+}