---

yaml
---
r: 37047
b: refs/heads/try2
c: 16ec9aa
h: refs/heads/master
i:
  37045: d69f2e8
  37043: 46ef68c
  37039: 4c7052d
v: v3

Author: nikomatsakis

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 4557f70487e10c1f4e304f4bb853dbab444359dc
+refs/heads/try2: 16ec9aa6e7b999e235007f75af2fd631f7333a84
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

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

@@ -1679,9 +1679,11 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
                     let expected_field_type =
                         ty::lookup_field_type(
                             tcx, class_id, field_id, substitutions);
-                    bot |= check_expr(fcx,
-                                      field.node.expr,
-                                      Some(expected_field_type));
+                    bot |=
+                        check_expr_with_assignability(
+                            fcx,
+                            field.node.expr,
+                            expected_field_type);
                     class_field_map.insert(
                         field.node.ident, (field_id, true));
                     fields_found += 1;

branches/try2/src/test/run-pass/struct-field-assignability.rs

@@ -0,0 +1,9 @@
+struct Foo {
+    x: &int
+}
+
+fn main() {
+    let f = Foo { x: @3 };
+    assert *f.x == 3;
+}
+