---

yaml
---
r: 272819
b: refs/heads/beta
c: d908ff1
h: refs/heads/master
i:
  272817: 1c1ab59
  272815: a7c7dbb

Author: jseyfried

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 32f251cc1c1ff8721b68b4afe5f86a6bb33c6822
+refs/heads/beta: d908ff1759bf27a8a8a99f113a246b8abc61f425
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_privacy/lib.rs

@@ -615,16 +615,10 @@ impl<'a, 'tcx> PrivacyVisitor<'a, 'tcx> {
             // decision solely based on the privacy of the method
             // invocation.
             Some(ast_map::NodeImplItem(ii)) => {
-                match ii.node {
-                    hir::ImplItemKind::Const(..) |
-                    hir::ImplItemKind::Method(..) => {
-                        let imp = self.tcx.map.get_parent_did(node_id);
-                        match self.tcx.impl_trait_ref(imp) {
-                            Some(..) => hir::Public,
-                            _ => ii.vis
-                        }
-                    }
-                    hir::ImplItemKind::Type(_) => hir::Public,
+                let imp = self.tcx.map.get_parent_did(node_id);
+                match self.tcx.impl_trait_ref(imp) {
+                    Some(..) => hir::Public,
+                    _ => ii.vis,
                 }
             }
             Some(ast_map::NodeTraitItem(_)) => hir::Public,
@@ -804,8 +798,8 @@ impl<'a, 'tcx> PrivacyVisitor<'a, 'tcx> {
             // Trait methods are always all public. The only controlling factor
             // is whether the trait itself is accessible or not.
             ty::TraitContainer(trait_def_id) => {
-                self.report_error(self.ensure_public(span, trait_def_id,
-                                                     None, "source trait"));
+                let msg = format!("source trait `{}`", self.tcx.item_path_str(trait_def_id));
+                self.report_error(self.ensure_public(span, trait_def_id, None, &msg));
             }
         }
     }

branches/beta/src/test/compile-fail/trait-not-accessible.rs

@@ -20,7 +20,7 @@ struct S;
 impl m::Pub for S {}
 
 fn g<T: m::Pub>(arg: T) {
-    arg.f(); //~ ERROR: source trait is private
+    arg.f(); //~ ERROR: source trait `m::Priv` is private
 }
 
 fn main() {