Improve UI tests

Author: Aaron1011

src/test/ui/privacy/pub-priv-dep/auxiliary/priv_dep.rs

@@ -1 +1,2 @@
 pub struct OtherType;
+pub trait OtherTrait {}

src/test/ui/privacy/pub-priv-dep/auxiliary/pub_dep.rs

@@ -0,0 +1 @@
+pub struct PubType;

src/test/ui/privacy/pub-priv-dep/pub-priv1.rs

@@ -1,11 +1,16 @@
  // aux-build:priv_dep.rs
+ // aux-build:pub_dep.rs
+ // compile-flags: --extern-public=pub_dep
 #![feature(public_private_dependencies)]
 #![deny(leaked_private_dependency)]
 
 // This crate is a private dependency
 extern crate priv_dep;
+// This crate is a public dependenct
+extern crate pub_dep;
 
-use priv_dep::OtherType;
+use priv_dep::{OtherType, OtherTrait};
+use pub_dep::PubType;
 
 // Type from private dependency used in private
 // type - this is fine
@@ -17,7 +22,8 @@ pub struct PublicType {
     pub field: OtherType,
     //~^ ERROR type `priv_dep::OtherType` from private dependency 'priv_dep' in public interface [leaked_private_dependency]
     //~| WARNING this was previously accepted
-    priv_field: OtherType,
+    priv_field: OtherType, // Private field - this is fine
+    pub other_field: PubType // Type from public dependency - this is fine
 }
 
 impl PublicType {
@@ -28,4 +34,11 @@ impl PublicType {
     fn priv_fn(param: OtherType) {}
 }
 
+pub trait MyPubTrait {
+    type Foo: OtherTrait;
+}
+//~^^^ ERROR trait `priv_dep::OtherTrait` from private dependency 'priv_dep' in public interface [leaked_private_dependency]
+//~| WARNING this was previously accepted
+
+
 fn main() {}

src/test/ui/privacy/pub-priv-dep/pub-priv1.stderr

@@ -1,25 +1,36 @@
 error: type `priv_dep::OtherType` from private dependency 'priv_dep' in public interface
-  --> $DIR/pub-priv1.rs:17:5
+  --> $DIR/pub-priv1.rs:22:5
    |
 LL |     pub field: OtherType,
    |     ^^^^^^^^^^^^^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/pub-priv1.rs:3:9
+  --> $DIR/pub-priv1.rs:5:9
    |
 LL | #![deny(leaked_private_dependency)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #44663 <https://github.com/rust-lang/rust/issues/44663>
 
 error: type `priv_dep::OtherType` from private dependency 'priv_dep' in public interface
-  --> $DIR/pub-priv1.rs:24:5
+  --> $DIR/pub-priv1.rs:30:5
    |
 LL |     pub fn pub_fn(param: OtherType) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #44663 <https://github.com/rust-lang/rust/issues/44663>
 
-error: aborting due to 2 previous errors
+error: trait `priv_dep::OtherTrait` from private dependency 'priv_dep' in public interface
+  --> $DIR/pub-priv1.rs:37:1
+   |
+LL | / pub trait MyPubTrait {
+LL | |     type Foo: OtherTrait;
+LL | | }
+   | |_^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #44663 <https://github.com/rust-lang/rust/issues/44663>
+
+error: aborting due to 3 previous errors