Auto merge of #29325 - alexcrichton:revert-trait-accessibility, r=nrc

These commits revert https://github.com/rust-lang/rust/pull/28504 and add a regression test pointed out by @petrochenkov, it's not immediately clear with the regression that the accessibility check should be removed, so for now preserve the behavior on stable by default.

r? @nrc 

1 files changed, 12 insertions, 11 deletions

diff --git a/src/test/run-pass/issue-16264.rs b/src/test/compile-fail/trait-not-accessible.rs
index 67701de6386..21668fcfeae 100644
--- a/src/test/run-pass/issue-16264.rs
+++ b/src/test/compile-fail/trait-not-accessible.rs
@@ -8,20 +8,21 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use outer::Foo;
+mod m {
+    trait Priv {
+        fn f(&self) {}
+    }
+    impl Priv for super::S {}
+    pub trait Pub: Priv {}
+}
 
-mod outer {
-    pub use self::inner::Foo;
+struct S;
+impl m::Pub for S {}
 
-    mod inner {
-        pub trait Foo {
-            fn bar(&self) {}
-        }
-        impl Foo for i32 {}
-    }
+fn g<T: m::Pub>(arg: T) {
+    arg.f(); //~ ERROR: source trait is private
 }
 
 fn main() {
-    let x: i32 = 0;
-    x.bar();
+    g(S);
 }