From f4f95eb3a9f2c3c38679db84aabbb7cdb46d2641 Mon Sep 17 00:00:00 2001
From: Eljay <lee@leejeffery.co.uk>
Date: Sat, 19 Sep 2015 00:58:36 +0100
Subject: [PATCH] Remove unnecessary trait accessibility check.

---
 src/librustc_privacy/lib.rs      |  8 ++------
 src/test/run-pass/issue-16264.rs | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 src/test/run-pass/issue-16264.rs

diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs
index 0384e7b6932..45104e4a964 100644
--- a/src/librustc_privacy/lib.rs
+++ b/src/librustc_privacy/lib.rs
@@ -847,12 +847,8 @@ fn check_method(&mut self, span: Span, method_def_id: DefId,
             ty::ImplContainer(_) => {
                 self.check_static_method(span, method_def_id, name)
             }
-            // 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"));
-            }
+            // Trait methods are always accessible if the trait is in scope.
+            ty::TraitContainer(_) => {}
         }
     }
 }
diff --git a/src/test/run-pass/issue-16264.rs b/src/test/run-pass/issue-16264.rs
new file mode 100644
index 00000000000..67701de6386
--- /dev/null
+++ b/src/test/run-pass/issue-16264.rs
@@ -0,0 +1,27 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use outer::Foo;
+
+mod outer {
+    pub use self::inner::Foo;
+
+    mod inner {
+        pub trait Foo {
+            fn bar(&self) {}
+        }
+        impl Foo for i32 {}
+    }
+}
+
+fn main() {
+    let x: i32 = 0;
+    x.bar();
+}