dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

relax priv-in-pub lint on generic bounds and where clauses in trait impls

This commit is contained in:
Jack Wrenn 2021-11-04 16:31:18 +00:00
parent 473eaa42e9
commit ebef8a8cee
9 changed files with 330 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_privacy/src/lib.rs
View File

@ -2069,7 +2069,11 @@ impl<'tcx> Visitor<'tcx> for PrivateItemsInPublicInterfacesVisitor<'tcx> {
// Subitems of trait impls have inherited publicity.
hir::ItemKind::Impl(ref impl_) => {
let impl_vis = ty::Visibility::of_impl(item.def_id, tcx, &Default::default());
self.check(item.def_id, impl_vis).generics().predicates();
// check that private components do not appear in the generics or predicates of inherent impls
// this check is intentionally NOT performed for impls of traits, per #90586
if impl_.of_trait.is_none() {
self.check(item.def_id, impl_vis).generics().predicates();
}
for impl_item_ref in impl_.items {
let impl_item_vis = if impl_.of_trait.is_none() {
min(tcx.visibility(impl_item_ref.id.def_id), impl_vis, tcx)

7
src/test/ui/const-generics/generic_const_exprs/eval-privacy.rs
View File

@ -9,12 +9,7 @@ pub trait Trait {
fn assoc_fn() -> Self::AssocTy;
}
impl<const U: u8> Trait for Const<U>
//~^ WARN private type
//~| WARN this was previously
//~| WARN private type
//~| WARN this was previously
impl<const U: u8> Trait for Const<U> // OK, trait impl predicates
where
Const<{ my_const_fn(U) }>: ,
{

35
src/test/ui/const-generics/generic_const_exprs/eval-privacy.stderr
View File

@ -1,36 +1,5 @@
warning: private type `fn(u8) -> u8 {my_const_fn}` in public interface (error E0446)
--> $DIR/eval-privacy.rs:12:1
|
LL | / impl<const U: u8> Trait for Const<U>
LL | |
LL | |
LL | |
... |
LL | | }
LL | | }
| |_^
|
= note: `#[warn(private_in_public)]` on by default
= 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 #34537 <https://github.com/rust-lang/rust/issues/34537>
warning: private type `fn(u8) -> u8 {my_const_fn}` in public interface (error E0446)
--> $DIR/eval-privacy.rs:12:1
|
LL | / impl<const U: u8> Trait for Const<U>
LL | |
LL | |
LL | |
... |
LL | | }
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 #34537 <https://github.com/rust-lang/rust/issues/34537>
error[E0446]: private type `fn(u8) -> u8 {my_const_fn}` in public interface
--> $DIR/eval-privacy.rs:21:5
--> $DIR/eval-privacy.rs:16:5
|
LL | type AssocTy = Const<{ my_const_fn(U) }>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type
@ -38,6 +7,6 @@ LL | type AssocTy = Const<{ my_const_fn(U) }>;
LL | const fn my_const_fn(val: u8) -> u8 {
| ----------------------------------- `fn(u8) -> u8 {my_const_fn}` declared as private
error: aborting due to previous error; 2 warnings emitted
error: aborting due to previous error
For more information about this error, try `rustc --explain E0446`.

7
src/test/ui/privacy/private-in-public-warn.rs
View File

@ -63,8 +63,7 @@ mod traits {
}
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 `traits::PrivTr` in public interface
//~^ WARNING hard error
impl<T: PrivTr> PubTr for Pub<T> {} // OK, trait impl predicates
}
mod traits_where {
@ -87,9 +86,7 @@ mod traits_where {
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
impl<T> PubTr for Pub<T> where T: PrivTr {} // OK, trait impl predicates
}
mod generics {

66
src/test/ui/privacy/private-in-public-warn.stderr
View File

@ -156,17 +156,8 @@ LL | impl<T: PrivTr> Pub<T> {}
= 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 #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private trait `traits::PrivTr` in public interface (error E0445)
--> $DIR/private-in-public-warn.rs:66:5
|
LL | impl<T: PrivTr> PubTr for Pub<T> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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 #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private trait `traits_where::PrivTr` in public interface (error E0445)
--> $DIR/private-in-public-warn.rs:75:5
--> $DIR/private-in-public-warn.rs:74:5
|
LL | pub type Alias<T> where T: PrivTr = T;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -175,7 +166,7 @@ LL | pub type Alias<T> where T: PrivTr = T;
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private trait `traits_where::PrivTr` in public interface (error E0445)
--> $DIR/private-in-public-warn.rs:79:5
--> $DIR/private-in-public-warn.rs:78:5
|
LL | pub trait Tr2<T> where T: PrivTr {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -184,7 +175,7 @@ LL | pub trait Tr2<T> where T: PrivTr {}
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private trait `traits_where::PrivTr` in public interface (error E0445)
--> $DIR/private-in-public-warn.rs:83:9
--> $DIR/private-in-public-warn.rs:82:9
|
LL | fn f<T>(arg: T) where T: PrivTr {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -193,7 +184,7 @@ LL | fn f<T>(arg: T) where T: PrivTr {}
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private trait `traits_where::PrivTr` in public interface (error E0445)
--> $DIR/private-in-public-warn.rs:87:5
--> $DIR/private-in-public-warn.rs:86:5
|
LL | impl<T> Pub<T> where T: PrivTr {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -201,17 +192,8 @@ LL | impl<T> Pub<T> where T: PrivTr {}
= 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 #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private trait `traits_where::PrivTr` in public interface (error E0445)
--> $DIR/private-in-public-warn.rs:90:5
|
LL | impl<T> PubTr for Pub<T> where T: PrivTr {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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 #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private trait `generics::PrivTr<generics::Pub>` in public interface (error E0445)
--> $DIR/private-in-public-warn.rs:101:5
--> $DIR/private-in-public-warn.rs:98:5
|
LL | pub trait Tr1: PrivTr<Pub> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -220,7 +202,7 @@ LL | pub trait Tr1: PrivTr<Pub> {}
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private type `generics::Priv` in public interface (error E0446)
--> $DIR/private-in-public-warn.rs:104:5
--> $DIR/private-in-public-warn.rs:101:5
|
LL | pub trait Tr2: PubTr<Priv> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -229,7 +211,7 @@ LL | pub trait Tr2: PubTr<Priv> {}
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private type `generics::Priv` in public interface (error E0446)
--> $DIR/private-in-public-warn.rs:106:5
--> $DIR/private-in-public-warn.rs:103:5
|
LL | pub trait Tr3: PubTr<[Priv; 1]> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -238,7 +220,7 @@ LL | pub trait Tr3: PubTr<[Priv; 1]> {}
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private type `generics::Priv` in public interface (error E0446)
--> $DIR/private-in-public-warn.rs:108:5
--> $DIR/private-in-public-warn.rs:105:5
|
LL | pub trait Tr4: PubTr<Pub<Priv>> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -247,7 +229,7 @@ LL | pub trait Tr4: PubTr<Pub<Priv>> {}
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
error[E0446]: private type `impls::Priv` in public interface
--> $DIR/private-in-public-warn.rs:135:9
--> $DIR/private-in-public-warn.rs:132:9
|
LL | struct Priv;
| ------------ `impls::Priv` declared as private
@ -256,7 +238,7 @@ LL | type Alias = Priv;
| ^^^^^^^^^^^^^^^^^^ can't leak private type
error: private type `aliases_pub::Priv` in public interface (error E0446)
--> $DIR/private-in-public-warn.rs:206:9
--> $DIR/private-in-public-warn.rs:203:9
|
LL | pub fn f(arg: Priv) {}
| ^^^^^^^^^^^^^^^^^^^
@ -264,6 +246,15 @@ LL | pub fn f(arg: Priv) {}
= 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 #34537 <https://github.com/rust-lang/rust/issues/34537>
error[E0446]: private type `aliases_pub::Priv` in public interface
--> $DIR/private-in-public-warn.rs:207:9
|
LL | struct Priv;
| ------------ `aliases_pub::Priv` declared as private
...
LL | type Check = Priv;
| ^^^^^^^^^^^^^^^^^^ can't leak private type
error[E0446]: private type `aliases_pub::Priv` in public interface
--> $DIR/private-in-public-warn.rs:210:9
|
@ -291,17 +282,8 @@ LL | struct Priv;
LL | type Check = Priv;
| ^^^^^^^^^^^^^^^^^^ can't leak private type
error[E0446]: private type `aliases_pub::Priv` in public interface
--> $DIR/private-in-public-warn.rs:219:9
|
LL | struct Priv;
| ------------ `aliases_pub::Priv` declared as private
...
LL | type Check = Priv;
| ^^^^^^^^^^^^^^^^^^ can't leak private type
error: private trait `PrivTr1` in public interface (error E0445)
--> $DIR/private-in-public-warn.rs:249:5
--> $DIR/private-in-public-warn.rs:246:5
|
LL | pub trait Tr1: PrivUseAliasTr {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -310,7 +292,7 @@ LL | pub trait Tr1: PrivUseAliasTr {}
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private trait `PrivTr1<Priv2>` in public interface (error E0445)
--> $DIR/private-in-public-warn.rs:252:5
--> $DIR/private-in-public-warn.rs:249:5
|
LL | pub trait Tr2: PrivUseAliasTr<PrivAlias> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -319,7 +301,7 @@ LL | pub trait Tr2: PrivUseAliasTr<PrivAlias> {}
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
error: private type `Priv2` in public interface (error E0446)
--> $DIR/private-in-public-warn.rs:252:5
--> $DIR/private-in-public-warn.rs:249:5
|
LL | pub trait Tr2: PrivUseAliasTr<PrivAlias> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -341,7 +323,7 @@ LL + pub type Alias<T> = T;
|
warning: where clauses are not enforced in type aliases
--> $DIR/private-in-public-warn.rs:75:29
--> $DIR/private-in-public-warn.rs:74:29
|
LL | pub type Alias<T> where T: PrivTr = T;
| ^^^^^^^^^
@ -352,6 +334,6 @@ LL - pub type Alias<T> where T: PrivTr = T;
LL + pub type Alias<T> = T;
|
error: aborting due to 36 previous errors; 2 warnings emitted
error: aborting due to 34 previous errors; 2 warnings emitted
For more information about this error, try `rustc --explain E0446`.

90
src/test/ui/privacy/where-priv-type.rs Normal file
View File

@ -0,0 +1,90 @@
// priv-in-pub lint tests where the private type appears in the
// `where` clause of a public item
#![crate_type = "lib"]
#![feature(generic_const_exprs)]
#![allow(incomplete_features)]
struct PrivTy;
trait PrivTr {}
pub struct PubTy;
pub struct PubTyGeneric<T>(T);
pub trait PubTr {}
impl PubTr for PrivTy {}
pub trait PubTrWithAssocTy { type AssocTy; }
impl PubTrWithAssocTy for PrivTy { type AssocTy = PrivTy; }
pub struct S
//~^ WARNING private type `PrivTy` in public interface
//~| WARNING hard error
where
PrivTy:
{}
pub enum E
//~^ WARNING private type `PrivTy` in public interface
//~| WARNING hard error
where
PrivTy:
{}
pub fn f()
//~^ WARNING private type `PrivTy` in public interface
//~| WARNING hard error
where
PrivTy:
{}
impl S
//~^ ERROR private type `PrivTy` in public interface
where
PrivTy:
{
pub fn f()
//~^ WARNING private type `PrivTy` in public interface
//~| WARNING hard error
where
PrivTy:
{}
}
impl PubTr for PubTy
where
PrivTy:
{}
impl<T> PubTr for PubTyGeneric<T>
where
T: PubTrWithAssocTy<AssocTy=PrivTy>
{}
pub struct Const<const U: u8>;
pub trait Trait {
type AssocTy;
fn assoc_fn() -> Self::AssocTy;
}
impl<const U: u8> Trait for Const<U>
where
Const<{ my_const_fn(U) }>: ,
{
type AssocTy = Const<{ my_const_fn(U) }>;
//~^ ERROR private type
fn assoc_fn() -> Self::AssocTy {
Const
}
}
const fn my_const_fn(val: u8) -> u8 {
// body of this function doesn't matter
val
}

82
src/test/ui/privacy/where-priv-type.stderr Normal file
View File

@ -0,0 +1,82 @@
warning: private type `PrivTy` in public interface (error E0446)
--> $DIR/where-priv-type.rs:19:1
|
LL | / pub struct S
LL | |
LL | |
LL | | where
LL | | PrivTy:
LL | | {}
| |__^
|
= note: `#[warn(private_in_public)]` on by default
= 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 #34537 <https://github.com/rust-lang/rust/issues/34537>
warning: private type `PrivTy` in public interface (error E0446)
--> $DIR/where-priv-type.rs:27:1
|
LL | / pub enum E
LL | |
LL | |
LL | | where
LL | | PrivTy:
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 #34537 <https://github.com/rust-lang/rust/issues/34537>
warning: private type `PrivTy` in public interface (error E0446)
--> $DIR/where-priv-type.rs:35:1
|
LL | / pub fn f()
LL | |
LL | |
LL | | where
LL | | PrivTy:
| |___________^
|
= 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 #34537 <https://github.com/rust-lang/rust/issues/34537>
error[E0446]: private type `PrivTy` in public interface
--> $DIR/where-priv-type.rs:43:1
|
LL | struct PrivTy;
| -------------- `PrivTy` declared as private
...
LL | / impl S
LL | |
LL | | where
LL | | PrivTy:
... |
LL | | {}
LL | | }
| |_^ can't leak private type
warning: private type `PrivTy` in public interface (error E0446)
--> $DIR/where-priv-type.rs:48:5
|
LL | / pub fn f()
LL | |
LL | |
LL | | where
LL | | PrivTy:
| |_______________^
|
= 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 #34537 <https://github.com/rust-lang/rust/issues/34537>
error[E0446]: private type `fn(u8) -> u8 {my_const_fn}` in public interface
--> $DIR/where-priv-type.rs:80:5
|
LL | type AssocTy = Const<{ my_const_fn(U) }>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type
...
LL | const fn my_const_fn(val: u8) -> u8 {
| ----------------------------------- `fn(u8) -> u8 {my_const_fn}` declared as private
error: aborting due to 2 previous errors; 4 warnings emitted
For more information about this error, try `rustc --explain E0446`.

56
src/test/ui/privacy/where-pub-type-impls-priv-trait.rs Normal file
View File

@ -0,0 +1,56 @@
// priv-in-pub lint tests where the private trait bounds a public type
#![crate_type = "lib"]
#![feature(generic_const_exprs)]
#![allow(incomplete_features)]
struct PrivTy;
trait PrivTr {}
pub struct PubTy;
pub struct PubTyGeneric<T>(T);
pub trait PubTr {}
impl PubTr for PrivTy {}
impl PrivTr for PubTy {}
pub trait PubTrWithAssocTy { type AssocTy; }
impl PubTrWithAssocTy for PrivTy { type AssocTy = PrivTy; }
pub struct S
//~^ ERROR private trait `PrivTr` in public interface
where
PubTy: PrivTr
{}
pub enum E
//~^ ERROR private trait `PrivTr` in public interface
where
PubTy: PrivTr
{}
pub fn f()
//~^ ERROR private trait `PrivTr` in public interface
where
PubTy: PrivTr
{}
impl S
//~^ ERROR private trait `PrivTr` in public interface
where
PubTy: PrivTr
{
pub fn f()
//~^ ERROR private trait `PrivTr` in public interface
where
PubTy: PrivTr
{}
}
impl PubTr for PubTy
where
PubTy: PrivTr
{}

68
src/test/ui/privacy/where-pub-type-impls-priv-trait.stderr Normal file
View File

@ -0,0 +1,68 @@
error[E0445]: private trait `PrivTr` in public interface
--> $DIR/where-pub-type-impls-priv-trait.rs:19:1
|
LL | trait PrivTr {}
| ------------ `PrivTr` declared as private
...
LL | / pub struct S
LL | |
LL | | where
LL | | PubTy: PrivTr
LL | | {}
| |__^ can't leak private trait
error[E0445]: private trait `PrivTr` in public interface
--> $DIR/where-pub-type-impls-priv-trait.rs:26:1
|
LL | trait PrivTr {}
| ------------ `PrivTr` declared as private
...
LL | / pub enum E
LL | |
LL | | where
LL | | PubTy: PrivTr
LL | | {}
| |__^ can't leak private trait
error[E0445]: private trait `PrivTr` in public interface
--> $DIR/where-pub-type-impls-priv-trait.rs:33:1
|
LL | trait PrivTr {}
| ------------ `PrivTr` declared as private
...
LL | / pub fn f()
LL | |
LL | | where
LL | | PubTy: PrivTr
| |_________________^ can't leak private trait
error[E0445]: private trait `PrivTr` in public interface
--> $DIR/where-pub-type-impls-priv-trait.rs:40:1
|
LL | trait PrivTr {}
| ------------ `PrivTr` declared as private
...
LL | / impl S
LL | |
LL | | where
LL | | PubTy: PrivTr
... |
LL | | {}
LL | | }
| |_^ can't leak private trait
error[E0445]: private trait `PrivTr` in public interface
--> $DIR/where-pub-type-impls-priv-trait.rs:45:5
|
LL | trait PrivTr {}
| ------------ `PrivTr` declared as private
...
LL | / pub fn f()
LL | |
LL | | where
LL | | PubTy: PrivTr
| |_____________________^ can't leak private trait
error: aborting due to 5 previous errors
For more information about this error, try `rustc --explain E0445`.