rustc_privacy: switch private-in-public checking to Ty.

eddyb · eddyb · commit 548e681f2f8c · 2016-11-28T05:12:41.000+02:00
diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs
diff --git a/src/test/compile-fail/E0445.rs b/src/test/compile-fail/E0445.rs
@@ -13,13 +13,13 @@ trait Foo {
 }
 
 pub trait Bar : Foo {}
-//~^ ERROR private trait in public interface [E0445]
+//~^ ERROR private trait `Foo` in public interface [E0445]
 //~| NOTE private trait can't be public
 pub struct Bar2<T: Foo>(pub T);
-//~^ ERROR private trait in public interface [E0445]
+//~^ ERROR private trait `Foo` in public interface [E0445]
 //~| NOTE private trait can't be public
 pub fn foo<T: Foo> (t: T) {}
-//~^ ERROR private trait in public interface [E0445]
+//~^ ERROR private trait `Foo` in public interface [E0445]
 //~| NOTE private trait can't be public
 
 fn main() {}
diff --git a/src/test/compile-fail/issue-18389.rs b/src/test/compile-fail/issue-18389.rs
@@ -14,7 +14,8 @@ use std::any::TypeId;
 trait Private<P, R> {
     fn call(&self, p: P, r: R);
 }
-pub trait Public: Private< //~ ERROR private trait in public interface
+pub trait Public: Private<
+//~^ ERROR private trait `Private<<Self as Public>::P, <Self as Public>::R>` in public interface
     <Self as Public>::P,
     <Self as Public>::R
 > {
diff --git a/src/test/compile-fail/issue-28514.rs b/src/test/compile-fail/issue-28514.rs
@@ -21,7 +21,7 @@ mod inner {
         fn b(&self) { }
     }
 
-    pub trait C: A + B { //~ ERROR private trait in public interface
+    pub trait C: A + B { //~ ERROR private trait `inner::A` in public interface
                          //~^ WARN will become a hard error
         fn c(&self) { }
     }
diff --git a/src/test/compile-fail/issue-30079.rs b/src/test/compile-fail/issue-30079.rs
@@ -16,7 +16,7 @@ struct SemiPriv;
 mod m1 {
     struct Priv;
     impl ::SemiPriv {
-        pub fn f(_: Priv) {} //~ ERROR private type in public interface
+        pub fn f(_: Priv) {} //~ ERROR private type `m1::Priv` in public interface
         //~^ WARNING hard error
     }
 
@@ -28,7 +28,7 @@ mod m1 {
 mod m2 {
     struct Priv;
     impl ::std::ops::Deref for ::SemiPriv {
-        type Target = Priv; //~ ERROR private type in public interface
+        type Target = Priv; //~ ERROR private type `m2::Priv` in public interface
         //~^ WARNING hard error
         fn deref(&self) -> &Self::Target { unimplemented!() }
     }
@@ -46,7 +46,7 @@ trait SemiPrivTrait {
 mod m3 {
     struct Priv;
     impl ::SemiPrivTrait for () {
-        type Assoc = Priv; //~ ERROR private type in public interface
+        type Assoc = Priv; //~ ERROR private type `m3::Priv` in public interface
         //~^ WARNING hard error
     }
 }
diff --git a/src/test/compile-fail/private-in-public-lint.rs b/src/test/compile-fail/private-in-public-lint.rs
@@ -13,7 +13,7 @@ mod m1 {
     struct Priv;
 
     impl Pub {
-        pub fn f() -> Priv {Priv} //~ ERROR private type in public interface
+        pub fn f() -> Priv {Priv} //~ ERROR private type `m1::Priv` in public interface
     }
 }
 
@@ -24,7 +24,7 @@ mod m2 {
     struct Priv;
 
     impl Pub {
-        pub fn f() -> Priv {Priv} //~ ERROR private type in public interface
+        pub fn f() -> Priv {Priv} //~ ERROR private type `m2::Priv` in public interface
     }
 }
 
diff --git a/src/test/compile-fail/private-in-public-warn.rs b/src/test/compile-fail/private-in-public-warn.rs
@@ -24,34 +24,34 @@ mod types {
         type Alias;
     }
 
-    pub type Alias = Priv; //~ ERROR private type in public interface
+    pub type Alias = Priv; //~ ERROR private type `types::Priv` in public interface
     //~^ WARNING hard error
     pub enum E {
-        V1(Priv), //~ ERROR private type in public interface
+        V1(Priv), //~ ERROR private type `types::Priv` in public interface
         //~^ WARNING hard error
-        V2 { field: Priv }, //~ ERROR private type in public interface
+        V2 { field: Priv }, //~ ERROR private type `types::Priv` in public interface
         //~^ WARNING hard error
     }
     pub trait Tr {
-        const C: Priv = Priv; //~ ERROR private type in public interface
+        const C: Priv = Priv; //~ ERROR private type `types::Priv` in public interface
         //~^ WARNING hard error
-        type Alias = Priv; //~ ERROR private type in public interface
+        type Alias = Priv; //~ ERROR private type `types::Priv` in public interface
         //~^ WARNING hard error
-        fn f1(arg: Priv) {} //~ ERROR private type in public interface
+        fn f1(arg: Priv) {} //~ ERROR private type `types::Priv` in public interface
         //~^ WARNING hard error
-        fn f2() -> Priv { panic!() } //~ ERROR private type in public interface
+        fn f2() -> Priv { panic!() } //~ ERROR private type `types::Priv` in public interface
         //~^ WARNING hard error
     }
     extern {
-        pub static ES: Priv; //~ ERROR private type in public interface
+        pub static ES: Priv; //~ ERROR private type `types::Priv` in public interface
         //~^ WARNING hard error
-        pub fn ef1(arg: Priv); //~ ERROR private type in public interface
+        pub fn ef1(arg: Priv); //~ ERROR private type `types::Priv` in public interface
         //~^ WARNING hard error
-        pub fn ef2() -> Priv; //~ ERROR private type in public interface
+        pub fn ef2() -> Priv; //~ ERROR private type `types::Priv` in public interface
         //~^ WARNING hard error
     }
     impl PubTr for Pub {
-        type Alias = Priv; //~ ERROR private type in public interface
+        type Alias = Priv; //~ ERROR private type `types::Priv` in public interface
         //~^ WARNING hard error
     }
 }
@@ -61,22 +61,23 @@ mod traits {
     pub struct Pub<T>(T);
     pub trait PubTr {}
 
-    pub type Alias<T: PrivTr> = T; //~ ERROR private trait in public interface
+    pub type Alias<T: PrivTr> = T; //~ ERROR private trait `traits::PrivTr` in public interface
     //~^ WARN trait bounds are not (yet) enforced in type definitions
     //~| WARNING hard error
-    pub trait Tr1: PrivTr {} //~ ERROR private trait in public interface
+    pub trait Tr1: PrivTr {} //~ ERROR private trait `traits::PrivTr` in public interface
     //~^ WARNING hard error
-    pub trait Tr2<T: PrivTr> {} //~ ERROR private trait in public interface
+    pub trait Tr2<T: PrivTr> {} //~ ERROR private trait `traits::PrivTr` in public interface
         //~^ WARNING hard error
     pub trait Tr3 {
-        type Alias: PrivTr; //~ ERROR private trait in public interface
-        //~^ WARNING hard error
-        fn f<T: PrivTr>(arg: T) {} //~ ERROR private trait in public interface
+        //~^ ERROR private trait `traits::PrivTr` in public interface
+        //~| WARNING hard error
+        type Alias: PrivTr;
+        fn f<T: PrivTr>(arg: T) {} //~ ERROR private trait `traits::PrivTr` in public interface
         //~^ WARNING hard error
     }
-    impl<T: PrivTr> Pub<T> {} //~ ERROR private trait in public interface
+    impl<T: PrivTr> Pub<T> {} //~ ERROR private trait `traits::PrivTr` in public interface
         //~^ WARNING hard error
-    impl<T: PrivTr> PubTr for Pub<T> {} //~ ERROR private trait in public interface
+    impl<T: PrivTr> PubTr for Pub<T> {} //~ ERROR private trait `traits::PrivTr` in public interface
         //~^ WARNING hard error
 }
 
@@ -85,18 +86,23 @@ mod traits_where {
     pub struct Pub<T>(T);
     pub trait PubTr {}
 
-    pub type Alias<T> where T: PrivTr = T; //~ ERROR private trait in public interface
-        //~^ WARNING hard error
-    pub trait Tr2<T> where T: PrivTr {} //~ ERROR private trait in public interface
-        //~^ WARNING hard error
+    pub type Alias<T> where T: PrivTr = T;
+        //~^ ERROR private trait `traits_where::PrivTr` in public interface
+        //~| WARNING hard error
+    pub trait Tr2<T> where T: PrivTr {}
+        //~^ ERROR private trait `traits_where::PrivTr` in public interface
+        //~| WARNING hard error
     pub trait Tr3 {
-        fn f<T>(arg: T) where T: PrivTr {} //~ ERROR private trait in public interface
-        //~^ WARNING hard error
+        fn f<T>(arg: T) where T: PrivTr {}
+        //~^ ERROR private trait `traits_where::PrivTr` in public interface
+        //~| WARNING hard error
     }
-    impl<T> Pub<T> where T: PrivTr {} //~ ERROR private trait in public interface
-        //~^ WARNING hard error
-    impl<T> PubTr for Pub<T> where T: PrivTr {} //~ ERROR private trait in public interface
-        //~^ WARNING hard error
+    impl<T> Pub<T> where T: PrivTr {}
+        //~^ ERROR private trait `traits_where::PrivTr` in public interface
+        //~| WARNING hard error
+    impl<T> PubTr for Pub<T> where T: PrivTr {}
+        //~^ ERROR private trait `traits_where::PrivTr` in public interface
+        //~| WARNING hard error
 }
 
 mod generics {
@@ -105,13 +111,14 @@ mod generics {
     trait PrivTr<T> {}
     pub trait PubTr<T> {}
 
-    pub trait Tr1: PrivTr<Pub> {} //~ ERROR private trait in public interface
-        //~^ WARNING hard error
-    pub trait Tr2: PubTr<Priv> {} //~ ERROR private type in public interface
+    pub trait Tr1: PrivTr<Pub> {}
+        //~^ ERROR private trait `generics::PrivTr<generics::Pub>` in public interface
+        //~| WARNING hard error
+    pub trait Tr2: PubTr<Priv> {} //~ ERROR private type `generics::Priv` in public interface
         //~^ WARNING hard error
-    pub trait Tr3: PubTr<[Priv; 1]> {} //~ ERROR private type in public interface
+    pub trait Tr3: PubTr<[Priv; 1]> {} //~ ERROR private type `generics::Priv` in public interface
         //~^ WARNING hard error
-    pub trait Tr4: PubTr<Pub<Priv>> {} //~ ERROR private type in public interface
+    pub trait Tr4: PubTr<Pub<Priv>> {} //~ ERROR private type `generics::Priv` in public interface
         //~^ WARNING hard error
 }
 
@@ -138,7 +145,7 @@ mod impls {
         type Alias = Priv; // OK
     }
     impl PubTr for Pub {
-        type Alias = Priv; //~ ERROR private type in public interface
+        type Alias = Priv; //~ ERROR private type `impls::Priv` in public interface
         //~^ WARNING hard error
     }
 }
@@ -210,23 +217,23 @@ mod aliases_pub {
     pub trait Tr2: PrivUseAliasTr<PrivAlias> {} // OK
 
     impl PrivAlias {
-        pub fn f(arg: Priv) {} //~ ERROR private type in public interface
+        pub fn f(arg: Priv) {} //~ ERROR private type `aliases_pub::Priv` in public interface
         //~^ WARNING hard error
     }
     // This doesn't even parse
     // impl <Priv as PrivTr>::AssocAlias {
-    //     pub fn f(arg: Priv) {} // ERROR private type in public interface
+    //     pub fn f(arg: Priv) {} // ERROR private type `aliases_pub::Priv` in public interface
     // }
     impl PrivUseAliasTr for PrivUseAlias {
-        type Check = Priv; //~ ERROR private type in public interface
+        type Check = Priv; //~ ERROR private type `aliases_pub::Priv` in public interface
         //~^ WARNING hard error
     }
     impl PrivUseAliasTr for PrivAlias {
-        type Check = Priv; //~ ERROR private type in public interface
+        type Check = Priv; //~ ERROR private type `aliases_pub::Priv` in public interface
         //~^ WARNING hard error
     }
     impl PrivUseAliasTr for <Priv as PrivTr>::AssocAlias {
-        type Check = Priv; //~ ERROR private type in public interface
+        type Check = Priv; //~ ERROR private type `aliases_pub::Priv` in public interface
         //~^ WARNING hard error
     }
 }
@@ -251,11 +258,13 @@ mod aliases_priv {
         type AssocAlias = Priv3;
     }
 
-    pub trait Tr1: PrivUseAliasTr {} //~ ERROR private trait in public interface
-        //~^ WARNING hard error
-    pub trait Tr2: PrivUseAliasTr<PrivAlias> {} //~ ERROR private trait in public interface
-     //~^ ERROR private type in public interface
+    pub trait Tr1: PrivUseAliasTr {}
+        //~^ ERROR private trait `aliases_priv::PrivTr1` in public interface
+        //~| WARNING hard error
+    pub trait Tr2: PrivUseAliasTr<PrivAlias> {}
+        //~^ ERROR private trait `aliases_priv::PrivTr1<aliases_priv::Priv2>` in public interface
         //~| WARNING hard error
+        //~| ERROR private type `aliases_priv::Priv2` in public interface
         //~| WARNING hard error
 
     impl PrivUseAlias {
diff --git a/src/test/compile-fail/private-in-public.rs b/src/test/compile-fail/private-in-public.rs

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ mod inner {`
`21`	`21`	`fn b(&self) { }`
`22`	`22`	`}`
`23`	`23`
`24`		`- pub trait C: A + B { //~ ERROR private trait in public interface`
	`24`	+ pub trait C: A + B { //~ ERROR private trait `inner::A` in public interface
`25`	`25`	`//~^ WARN will become a hard error`
`26`	`26`	`fn c(&self) { }`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ struct SemiPriv;`
`16`	`16`	`mod m1 {`
`17`	`17`	`struct Priv;`
`18`	`18`	`impl ::SemiPriv {`
`19`		`- pub fn f(_: Priv) {} //~ ERROR private type in public interface`
	`19`	+ pub fn f(_: Priv) {} //~ ERROR private type `m1::Priv` in public interface
`20`	`20`	`//~^ WARNING hard error`
`21`	`21`	`}`
`22`	`22`
`@@ -28,7 +28,7 @@ mod m1 {`
`28`	`28`	`mod m2 {`
`29`	`29`	`struct Priv;`
`30`	`30`	`impl ::std::ops::Deref for ::SemiPriv {`
`31`		`- type Target = Priv; //~ ERROR private type in public interface`
	`31`	+ type Target = Priv; //~ ERROR private type `m2::Priv` in public interface
`32`	`32`	`//~^ WARNING hard error`
`33`	`33`	`fn deref(&self) -> &Self::Target { unimplemented!() }`
`34`	`34`	`}`
`@@ -46,7 +46,7 @@ trait SemiPrivTrait {`
`46`	`46`	`mod m3 {`
`47`	`47`	`struct Priv;`
`48`	`48`	`impl ::SemiPrivTrait for () {`
`49`		`- type Assoc = Priv; //~ ERROR private type in public interface`
	`49`	+ type Assoc = Priv; //~ ERROR private type `m3::Priv` in public interface
`50`	`50`	`//~^ WARNING hard error`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ mod m1 {`
`13`	`13`	`struct Priv;`
`14`	`14`
`15`	`15`	`impl Pub {`
`16`		`- pub fn f() -> Priv {Priv} //~ ERROR private type in public interface`
	`16`	+ pub fn f() -> Priv {Priv} //~ ERROR private type `m1::Priv` in public interface
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`@@ -24,7 +24,7 @@ mod m2 {`
`24`	`24`	`struct Priv;`
`25`	`25`
`26`	`26`	`impl Pub {`
`27`		`- pub fn f() -> Priv {Priv} //~ ERROR private type in public interface`
	`27`	+ pub fn f() -> Priv {Priv} //~ ERROR private type `m2::Priv` in public interface
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`