---

nikomatsakis · nikomatsakis · commit 15b5119c4650 · 2013-01-07T18:46:37.000-08:00
yaml --- r: 41602 b: refs/heads/master c: 16ec9aa h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4557f70487e10c1f4e304f4bb853dbab444359dc
+refs/heads/master: 16ec9aa6e7b999e235007f75af2fd631f7333a84
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
diff --git a/trunk/src/librustc/middle/typeck/check/mod.rs b/trunk/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;
diff --git a/trunk/src/test/run-pass/struct-field-assignability.rs b/trunk/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;
+}
+
