---

yaml
---
r: 30332
b: refs/heads/incoming
c: 9b88b5f
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: fba673b26bc029ef234f56e177559fd0b9e48507
+refs/heads/incoming: 9b88b5fe3862c45318487c37c8a48d9605590ce0
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/privacy.rs

@@ -3,8 +3,9 @@
 
 use /*mod*/ syntax::ast;
 use /*mod*/ syntax::visit;
-use syntax::ast::{expr_field, ident, item_class, item_impl, item_trait};
-use syntax::ast::{local_crate, node_id, private, provided, required};
+use syntax::ast::{expr_field, expr_struct, ident, item_class, item_impl};
+use syntax::ast::{item_trait, local_crate, node_id, pat_struct, private};
+use syntax::ast::{provided, required};
 use syntax::ast_map::{node_item, node_method};
 use ty::ty_class;
 use typeck::{method_map, method_origin, method_param, method_static};
@@ -160,7 +161,7 @@ fn check_crate(tcx: ty::ctxt, method_map: &method_map, crate: @ast::crate) {
                             match method_map.find(expr.id) {
                                 None => {
                                     debug!("(privacy checking) checking \
-                                            field");
+                                            field access");
                                     check_field(expr.span, id, ident);
                                 }
                                 Some(entry) => {
@@ -173,11 +174,58 @@ fn check_crate(tcx: ty::ctxt, method_map: &method_map, crate: @ast::crate) {
                         _ => {}
                     }
                 }
+                expr_struct(_, fields, _) => {
+                    match ty::get(ty::expr_ty(tcx, expr)).struct {
+                        ty_class(id, _) => {
+                            if id.crate != local_crate ||
+                                    !privileged_items.contains(id.node) {
+                                for fields.each |field| {
+                                        debug!("(privacy checking) checking \
+                                                field in struct literal");
+                                    check_field(expr.span, id,
+                                                field.node.ident);
+                                }
+                            }
+                        }
+                        _ => {
+                            tcx.sess.span_bug(expr.span, ~"struct expr \
+                                                           didn't have \
+                                                           struct type?!");
+                        }
+                    }
+                }
                 _ => {}
             }
 
             visit::visit_expr(expr, method_map, visitor);
         },
+        visit_pat: |pattern, method_map, visitor| {
+            match pattern.node {
+                pat_struct(_, fields, _) => {
+                    match ty::get(ty::pat_ty(tcx, pattern)).struct {
+                        ty_class(id, _) => {
+                            if id.crate != local_crate ||
+                                    !privileged_items.contains(id.node) {
+                                for fields.each |field| {
+                                        debug!("(privacy checking) checking \
+                                                struct pattern");
+                                    check_field(pattern.span, id,
+                                                field.ident);
+                                }
+                            }
+                        }
+                        _ => {
+                            tcx.sess.span_bug(pattern.span,
+                                              ~"struct pattern didn't have \
+                                                struct type?!");
+                        }
+                    }
+                }
+                _ => {}
+            }
+
+            visit::visit_pat(pattern, method_map, visitor);
+        },
         .. *visit::default_visitor()
     });
     visit::visit_crate(*crate, method_map, visitor);

branches/incoming/src/test/compile-fail/private-struct-field-ctor.rs

@@ -0,0 +1,10 @@
+mod a {
+    struct Foo {
+        priv x: int
+    }
+}
+
+fn main() {
+    let s = a::Foo { x: 1 };    //~ ERROR field `x` is private
+}
+

branches/incoming/src/test/compile-fail/private-struct-field-pattern.rs

@@ -0,0 +1,18 @@
+use a::Foo;
+
+mod a {
+    struct Foo {
+        priv x: int
+    }
+
+    fn make() -> Foo {
+        Foo { x: 3 }
+    }
+}
+
+fn main() {
+    match a::make() {
+        Foo { x: _ } => {}  //~ ERROR field `x` is private
+    }
+}
+