Skip to content

Commit ebef8a8

Browse files
jswrennjswrenn
committed
relax priv-in-pub lint on generic bounds and where clauses in trait impls
1 parent 473eaa4 commit ebef8a8

File tree

9 files changed

+325
-82
lines changed

9 files changed

+325
-82
lines changed

‎compiler/rustc_privacy/src/lib.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2069,7 +2069,11 @@ impl<'tcx> Visitor<'tcx> for PrivateItemsInPublicInterfacesVisitor<'tcx> {
20692069
// Subitems of trait impls have inherited publicity.
20702070
hir::ItemKind::Impl(ref impl_) => {
20712071
let impl_vis = ty::Visibility::of_impl(item.def_id, tcx, &Default::default());
2072-
self.check(item.def_id, impl_vis).generics().predicates();
2072+
// check that private components do not appear in the generics or predicates of inherent impls
2073+
// this check is intentionally NOT performed for impls of traits, per #90586
2074+
if impl_.of_trait.is_none() {
2075+
self.check(item.def_id, impl_vis).generics().predicates();
2076+
}
20732077
for impl_item_ref in impl_.items {
20742078
let impl_item_vis = if impl_.of_trait.is_none() {
20752079
min(tcx.visibility(impl_item_ref.id.def_id), impl_vis, tcx)

‎src/test/ui/const-generics/generic_const_exprs/eval-privacy.rs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ pub trait Trait {
99
fn assoc_fn() -> Self::AssocTy;
1010
}
1111

12-
impl<const U: u8> Trait for Const<U>
13-
//~^ WARN private type
14-
//~| WARN this was previously
15-
//~| WARN private type
16-
//~| WARN this was previously
17-
12+
impl<const U: u8> Trait for Const<U> // OK, trait impl predicates
1813
where
1914
Const<{ my_const_fn(U) }>: ,
2015
{

‎src/test/ui/const-generics/generic_const_exprs/eval-privacy.stderr‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,12 @@
1-
warning: private type `fn(u8) -> u8 {my_const_fn}` in public interface (error E0446)
2-
--> $DIR/eval-privacy.rs:12:1
3-
|
4-
LL | / impl<const U: u8> Trait for Const<U>
5-
LL | |
6-
LL | |
7-
LL | |
8-
... |
9-
LL | | }
10-
LL | | }
11-
| |_^
12-
|
13-
= note: `#[warn(private_in_public)]` on by default
14-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
15-
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
16-
17-
warning: private type `fn(u8) -> u8 {my_const_fn}` in public interface (error E0446)
18-
--> $DIR/eval-privacy.rs:12:1
19-
|
20-
LL | / impl<const U: u8> Trait for Const<U>
21-
LL | |
22-
LL | |
23-
LL | |
24-
... |
25-
LL | | }
26-
LL | | }
27-
| |_^
28-
|
29-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
30-
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
31-
321
error[E0446]: private type `fn(u8) -> u8 {my_const_fn}` in public interface
33-
--> $DIR/eval-privacy.rs:21:5
2+
--> $DIR/eval-privacy.rs:16:5
343
|
354
LL | type AssocTy = Const<{ my_const_fn(U) }>;
365
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type
376
...
387
LL | const fn my_const_fn(val: u8) -> u8 {
398
| ----------------------------------- `fn(u8) -> u8 {my_const_fn}` declared as private
409

41-
error: aborting due to previous error; 2 warnings emitted
10+
error: aborting due to previous error
4211

4312
For more information about this error, try `rustc --explain E0446`.

‎src/test/ui/privacy/private-in-public-warn.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ mod traits {
6363
}
6464
impl<T: PrivTr> Pub<T> {} //~ ERROR private trait `traits::PrivTr` in public interface
6565
//~^ WARNING hard error
66-
impl<T: PrivTr> PubTr for Pub<T> {} //~ ERROR private trait `traits::PrivTr` in public interface
67-
//~^ WARNING hard error
66+
impl<T: PrivTr> PubTr for Pub<T> {} // OK, trait impl predicates
6867
}
6968

7069
mod traits_where {
@@ -87,9 +86,7 @@ mod traits_where {
8786
impl<T> Pub<T> where T: PrivTr {}
8887
//~^ ERROR private trait `traits_where::PrivTr` in public interface
8988
//~| WARNING hard error
90-
impl<T> PubTr for Pub<T> where T: PrivTr {}
91-
//~^ ERROR private trait `traits_where::PrivTr` in public interface
92-
//~| WARNING hard error
89+
impl<T> PubTr for Pub<T> where T: PrivTr {} // OK, trait impl predicates
9390
}
9491

9592
mod generics {

‎src/test/ui/privacy/private-in-public-warn.stderr‎

Lines changed: 19 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,8 @@ LL | impl<T: PrivTr> Pub<T> {}
156156
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
157157
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
158158

159-
error: private trait `traits::PrivTr` in public interface (error E0445)
160-
--> $DIR/private-in-public-warn.rs:66:5
161-
|
162-
LL | impl<T: PrivTr> PubTr for Pub<T> {}
163-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
164-
|
165-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
166-
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
167-
168159
error: private trait `traits_where::PrivTr` in public interface (error E0445)
169-
--> $DIR/private-in-public-warn.rs:75:5
160+
--> $DIR/private-in-public-warn.rs:74:5
170161
|
171162
LL | pub type Alias<T> where T: PrivTr = T;
172163
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -175,7 +166,7 @@ LL | pub type Alias<T> where T: PrivTr = T;
175166
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
176167

177168
error: private trait `traits_where::PrivTr` in public interface (error E0445)
178-
--> $DIR/private-in-public-warn.rs:79:5
169+
--> $DIR/private-in-public-warn.rs:78:5
179170
|
180171
LL | pub trait Tr2<T> where T: PrivTr {}
181172
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -184,7 +175,7 @@ LL | pub trait Tr2<T> where T: PrivTr {}
184175
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
185176

186177
error: private trait `traits_where::PrivTr` in public interface (error E0445)
187-
--> $DIR/private-in-public-warn.rs:83:9
178+
--> $DIR/private-in-public-warn.rs:82:9
188179
|
189180
LL | fn f<T>(arg: T) where T: PrivTr {}
190181
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -193,25 +184,16 @@ LL | fn f<T>(arg: T) where T: PrivTr {}
193184
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
194185

195186
error: private trait `traits_where::PrivTr` in public interface (error E0445)
196-
--> $DIR/private-in-public-warn.rs:87:5
187+
--> $DIR/private-in-public-warn.rs:86:5
197188
|
198189
LL | impl<T> Pub<T> where T: PrivTr {}
199190
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
200191
|
201192
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
202193
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
203194

204-
error: private trait `traits_where::PrivTr` in public interface (error E0445)
205-
--> $DIR/private-in-public-warn.rs:90:5
206-
|
207-
LL | impl<T> PubTr for Pub<T> where T: PrivTr {}
208-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
209-
|
210-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
211-
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
212-
213195
error: private trait `generics::PrivTr<generics::Pub>` in public interface (error E0445)
214-
--> $DIR/private-in-public-warn.rs:101:5
196+
--> $DIR/private-in-public-warn.rs:98:5
215197
|
216198
LL | pub trait Tr1: PrivTr<Pub> {}
217199
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -220,7 +202,7 @@ LL | pub trait Tr1: PrivTr<Pub> {}
220202
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
221203

222204
error: private type `generics::Priv` in public interface (error E0446)
223-
--> $DIR/private-in-public-warn.rs:104:5
205+
--> $DIR/private-in-public-warn.rs:101:5
224206
|
225207
LL | pub trait Tr2: PubTr<Priv> {}
226208
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -229,7 +211,7 @@ LL | pub trait Tr2: PubTr<Priv> {}
229211
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
230212

231213
error: private type `generics::Priv` in public interface (error E0446)
232-
--> $DIR/private-in-public-warn.rs:106:5
214+
--> $DIR/private-in-public-warn.rs:103:5
233215
|
234216
LL | pub trait Tr3: PubTr<[Priv; 1]> {}
235217
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -238,7 +220,7 @@ LL | pub trait Tr3: PubTr<[Priv; 1]> {}
238220
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
239221

240222
error: private type `generics::Priv` in public interface (error E0446)
241-
--> $DIR/private-in-public-warn.rs:108:5
223+
--> $DIR/private-in-public-warn.rs:105:5
242224
|
243225
LL | pub trait Tr4: PubTr<Pub<Priv>> {}
244226
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -247,7 +229,7 @@ LL | pub trait Tr4: PubTr<Pub<Priv>> {}
247229
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
248230

249231
error[E0446]: private type `impls::Priv` in public interface
250-
--> $DIR/private-in-public-warn.rs:135:9
232+
--> $DIR/private-in-public-warn.rs:132:9
251233
|
252234
LL | struct Priv;
253235
| ------------ `impls::Priv` declared as private
@@ -256,7 +238,7 @@ LL | type Alias = Priv;
256238
| ^^^^^^^^^^^^^^^^^^ can't leak private type
257239

258240
error: private type `aliases_pub::Priv` in public interface (error E0446)
259-
--> $DIR/private-in-public-warn.rs:206:9
241+
--> $DIR/private-in-public-warn.rs:203:9
260242
|
261243
LL | pub fn f(arg: Priv) {}
262244
| ^^^^^^^^^^^^^^^^^^^
@@ -265,7 +247,7 @@ LL | pub fn f(arg: Priv) {}
265247
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
266248

267249
error[E0446]: private type `aliases_pub::Priv` in public interface
268-
--> $DIR/private-in-public-warn.rs:210:9
250+
--> $DIR/private-in-public-warn.rs:207:9
269251
|
270252
LL | struct Priv;
271253
| ------------ `aliases_pub::Priv` declared as private
@@ -274,7 +256,7 @@ LL | type Check = Priv;
274256
| ^^^^^^^^^^^^^^^^^^ can't leak private type
275257

276258
error[E0446]: private type `aliases_pub::Priv` in public interface
277-
--> $DIR/private-in-public-warn.rs:213:9
259+
--> $DIR/private-in-public-warn.rs:210:9
278260
|
279261
LL | struct Priv;
280262
| ------------ `aliases_pub::Priv` declared as private
@@ -283,7 +265,7 @@ LL | type Check = Priv;
283265
| ^^^^^^^^^^^^^^^^^^ can't leak private type
284266

285267
error[E0446]: private type `aliases_pub::Priv` in public interface
286-
--> $DIR/private-in-public-warn.rs:216:9
268+
--> $DIR/private-in-public-warn.rs:213:9
287269
|
288270
LL | struct Priv;
289271
| ------------ `aliases_pub::Priv` declared as private
@@ -292,7 +274,7 @@ LL | type Check = Priv;
292274
| ^^^^^^^^^^^^^^^^^^ can't leak private type
293275

294276
error[E0446]: private type `aliases_pub::Priv` in public interface
295-
--> $DIR/private-in-public-warn.rs:219:9
277+
--> $DIR/private-in-public-warn.rs:216:9
296278
|
297279
LL | struct Priv;
298280
| ------------ `aliases_pub::Priv` declared as private
@@ -301,7 +283,7 @@ LL | type Check = Priv;
301283
| ^^^^^^^^^^^^^^^^^^ can't leak private type
302284

303285
error: private trait `PrivTr1` in public interface (error E0445)
304-
--> $DIR/private-in-public-warn.rs:249:5
286+
--> $DIR/private-in-public-warn.rs:246:5
305287
|
306288
LL | pub trait Tr1: PrivUseAliasTr {}
307289
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -310,7 +292,7 @@ LL | pub trait Tr1: PrivUseAliasTr {}
310292
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
311293

312294
error: private trait `PrivTr1<Priv2>` in public interface (error E0445)
313-
--> $DIR/private-in-public-warn.rs:252:5
295+
--> $DIR/private-in-public-warn.rs:249:5
314296
|
315297
LL | pub trait Tr2: PrivUseAliasTr<PrivAlias> {}
316298
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -319,7 +301,7 @@ LL | pub trait Tr2: PrivUseAliasTr<PrivAlias> {}
319301
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
320302

321303
error: private type `Priv2` in public interface (error E0446)
322-
--> $DIR/private-in-public-warn.rs:252:5
304+
--> $DIR/private-in-public-warn.rs:249:5
323305
|
324306
LL | pub trait Tr2: PrivUseAliasTr<PrivAlias> {}
325307
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -341,7 +323,7 @@ LL + pub type Alias<T> = T;
341323
|
342324

343325
warning: where clauses are not enforced in type aliases
344-
--> $DIR/private-in-public-warn.rs:75:29
326+
--> $DIR/private-in-public-warn.rs:74:29
345327
|
346328
LL | pub type Alias<T> where T: PrivTr = T;
347329
| ^^^^^^^^^
@@ -352,6 +334,6 @@ LL - pub type Alias<T> where T: PrivTr = T;
352334
LL + pub type Alias<T> = T;
353335
|
354336

355-
error: aborting due to 36 previous errors; 2 warnings emitted
337+
error: aborting due to 34 previous errors; 2 warnings emitted
356338

357339
For more information about this error, try `rustc --explain E0446`.

‎src/test/ui/privacy/where-priv-type.rs‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
// priv-in-pub lint tests where the private type appears in the
2+
// `where` clause of a public item
3+
4+
#![crate_type = "lib"]
5+
#![feature(generic_const_exprs)]
6+
#![allow(incomplete_features)]
7+
8+
9+
struct PrivTy;
10+
trait PrivTr {}
11+
pub struct PubTy;
12+
pub struct PubTyGeneric<T>(T);
13+
pub trait PubTr {}
14+
impl PubTr for PrivTy {}
15+
pub trait PubTrWithAssocTy { type AssocTy; }
16+
impl PubTrWithAssocTy for PrivTy { type AssocTy = PrivTy; }
17+
18+
19+
pub struct S
20+
//~^ WARNING private type `PrivTy` in public interface
21+
//~| WARNING hard error
22+
where
23+
PrivTy:
24+
{}
25+
26+
27+
pub enum E
28+
//~^ WARNING private type `PrivTy` in public interface
29+
//~| WARNING hard error
30+
where
31+
PrivTy:
32+
{}
33+
34+
35+
pub fn f()
36+
//~^ WARNING private type `PrivTy` in public interface
37+
//~| WARNING hard error
38+
where
39+
PrivTy:
40+
{}
41+
42+
43+
impl S
44+
//~^ ERROR private type `PrivTy` in public interface
45+
where
46+
PrivTy:
47+
{
48+
pub fn f()
49+
//~^ WARNING private type `PrivTy` in public interface
50+
//~| WARNING hard error
51+
where
52+
PrivTy:
53+
{}
54+
}
55+
56+
57+
impl PubTr for PubTy
58+
where
59+
PrivTy:
60+
{}
61+
62+
63+
impl<T> PubTr for PubTyGeneric<T>
64+
where
65+
T: PubTrWithAssocTy<AssocTy=PrivTy>
66+
{}
67+
68+
69+
pub struct Const<const U: u8>;
70+
71+
pub trait Trait {
72+
type AssocTy;
73+
fn assoc_fn() -> Self::AssocTy;
74+
}
75+
76+
impl<const U: u8> Trait for Const<U>
77+
where
78+
Const<{ my_const_fn(U) }>: ,
79+
{
80+
type AssocTy = Const<{ my_const_fn(U) }>;
81+
//~^ ERROR private type
82+
fn assoc_fn() -> Self::AssocTy {
83+
Const
84+
}
85+
}
86+
87+
const fn my_const_fn(val: u8) -> u8 {
88+
// body of this function doesn't matter
89+
val
90+
}

0 commit comments

Comments
 (0)