---

yaml
---
r: 40768
b: refs/heads/dist-snap
c: d42bdf1
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: a7159be24a9c81517a46e09c7ff62cadc72759b6
+refs/heads/dist-snap: d42bdf1997ebaeb8a893947df563ff07d039cf08
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/privacy.rs

@@ -199,7 +199,10 @@ fn check_crate(tcx: ty::ctxt, method_map: &method_map, crate: @ast::crate) {
         visit_expr: |expr, method_map: &method_map, visitor| {
             match expr.node {
                 expr_field(base, ident, _) => {
-                    match ty::get(ty::expr_ty(tcx, base)).sty {
+                    // With type_autoderef, make sure we don't
+                    // allow pointers to violate privacy
+                    match ty::get(ty::type_autoderef(tcx, ty::expr_ty(tcx,
+                                                          base))).sty {
                         ty_struct(id, _)
                         if id.crate != local_crate ||
                            !privileged_items.contains(&(id.node)) => {
@@ -220,7 +223,9 @@ fn check_crate(tcx: ty::ctxt, method_map: &method_map, crate: @ast::crate) {
                     }
                 }
                 expr_method_call(base, _, _, _, _) => {
-                    match ty::get(ty::expr_ty(tcx, base)).sty {
+                    // Ditto
+                    match ty::get(ty::type_autoderef(tcx, ty::expr_ty(tcx,
+                                                          base))).sty {
                         ty_struct(id, _)
                         if id.crate != local_crate ||
                            !privileged_items.contains(&(id.node)) => {

branches/dist-snap/src/test/compile-fail/issue-3763.rs

@@ -8,20 +8,25 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 mod my_mod {
     pub struct MyStruct {
         priv priv_field: int
     }
     pub fn MyStruct () -> MyStruct {
         MyStruct {priv_field: 4}
     }
+    impl MyStruct {
+        priv fn happyfun() {}
+    }
 }
 
 fn main() {
     let my_struct = my_mod::MyStruct();
-    let _woohoo = (&my_struct).priv_field; // compiles but shouldn't
-    let _woohoo = (~my_struct).priv_field; // ditto
-    let _woohoo = (@my_struct).priv_field; // ditto
-   // let nope = my_struct.priv_field;       // compile error as expected
+    let _woohoo = (&my_struct).priv_field; //~ ERROR field `priv_field` is private
+    let _woohoo = (~my_struct).priv_field; //~ ERROR field `priv_field` is private
+    let _woohoo = (@my_struct).priv_field; //~ ERROR field `priv_field` is private
+    (&my_struct).happyfun();               //~ ERROR method `happyfun` is private
+    (~my_struct).happyfun();               //~ ERROR method `happyfun` is private
+    (@my_struct).happyfun();               //~ ERROR method `happyfun` is private
+    let nope = my_struct.priv_field;       //~ ERROR field `priv_field` is private
 }