Skip to content

Commit 8b1c424

Browse files
petrochenkovpetrochenkov
committed
privacy: Use common DefId visiting infra for all privacy visitors
1 parent 6efaef6 commit 8b1c424

17 files changed

+565
-533
lines changed

‎src/librustc/hir/mod.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,6 +2090,15 @@ impl VisibilityKind {
20902090
VisibilityKind::Restricted { .. } => true,
20912091
}
20922092
}
2093+
2094+
pub fn descr(&self) -> &'static str {
2095+
match *self {
2096+
VisibilityKind::Public => "public",
2097+
VisibilityKind::Inherited => "private",
2098+
VisibilityKind::Crate(..) => "crate-visible",
2099+
VisibilityKind::Restricted { .. } => "restricted",
2100+
}
2101+
}
20932102
}
20942103

20952104
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]

‎src/librustc_privacy/lib.rs

Lines changed: 408 additions & 503 deletions
Large diffs are not rendered by default.

‎src/libstd/sys/windows/handle.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,6 @@ impl RawHandle {
160160
}
161161
}
162162

163-
pub fn read_to_end(&self, buf: &mut Vec<u8>) -> io::Result<usize> {
164-
let mut me = self;
165-
(&mut me).read_to_end(buf)
166-
}
167-
168163
pub fn write(&self, buf: &[u8]) -> io::Result<usize> {
169164
let mut amt = 0;
170165
let len = cmp::min(buf.len(), <c::DWORD>::max_value() as usize) as c::DWORD;

‎src/libstd/sys/windows/stdio.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,6 @@ impl Stdin {
128128
// MemReader shouldn't error here since we just filled it
129129
utf8.read(buf)
130130
}
131-
132-
pub fn read_to_end(&self, buf: &mut Vec<u8>) -> io::Result<usize> {
133-
let mut me = self;
134-
(&mut me).read_to_end(buf)
135-
}
136131
}
137132

138133
#[unstable(reason = "not public", issue = "0", feature = "fd_read")]

‎src/test/ui/error-codes/E0445.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ trait Foo {
44

55
pub trait Bar : Foo {}
66
//~^ ERROR private trait `Foo` in public interface [E0445]
7-
//~| NOTE can't leak private trait
87
pub struct Bar2<T: Foo>(pub T);
98
//~^ ERROR private trait `Foo` in public interface [E0445]
10-
//~| NOTE can't leak private trait
119
pub fn foo<T: Foo> (t: T) {}
1210
//~^ ERROR private trait `Foo` in public interface [E0445]
13-
//~| NOTE can't leak private trait
1411

1512
fn main() {}

‎src/test/ui/error-codes/E0445.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ LL | pub trait Bar : Foo {}
55
| ^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
66

77
error[E0445]: private trait `Foo` in public interface
8-
--> $DIR/E0445.rs:8:1
8+
--> $DIR/E0445.rs:7:1
99
|
1010
LL | pub struct Bar2<T: Foo>(pub T);
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
1212

1313
error[E0445]: private trait `Foo` in public interface
14-
--> $DIR/E0445.rs:11:1
14+
--> $DIR/E0445.rs:9:1
1515
|
1616
LL | pub fn foo<T: Foo> (t: T) {}
1717
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait

‎src/test/ui/impl-trait/issue-49376.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ fn gen() -> impl PartialOrd + PartialEq + Debug { }
99

1010
struct Bar {}
1111
trait Foo<T = Self> {}
12+
trait FooNested<T = Option<Self>> {}
1213
impl Foo for Bar {}
14+
impl FooNested for Bar {}
1315

14-
fn foo() -> impl Foo {
16+
fn foo() -> impl Foo + FooNested {
1517
Bar {}
1618
}
1719

‎src/test/ui/issues/issue-18389.stderr

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
error[E0445]: private trait `Private<<Self as Public>::P, <Self as Public>::R>` in public interface
22
--> $DIR/issue-18389.rs:7:1
33
|
4+
LL | trait Private<P, R> {
5+
| - `Private<<Self as Public>::P, <Self as Public>::R>` declared as private
6+
...
47
LL | / pub trait Public: Private<
58
LL | | //~^ ERROR private trait `Private<<Self as Public>::P, <Self as Public>::R>` in public interface
69
LL | | <Self as Public>::P,

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Patterns and expressions are not interface parts and don't produce private-in-public errors.
2+
3+
// compile-pass
4+
5+
struct Priv1(usize);
6+
struct Priv2;
7+
8+
pub struct Pub(Priv2);
9+
10+
pub fn public_expr(_: [u8; Priv1(0).0]) {} // OK
11+
pub fn public_pat(Pub(Priv2): Pub) {} // OK
12+
13+
fn main() {}

‎src/test/ui/privacy/private-in-public-non-principal-2.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#![feature(optin_builtin_traits)]
2+
3+
#[allow(private_in_public)]
4+
mod m {
5+
pub trait PubPrincipal {}
6+
auto trait PrivNonPrincipal {}
7+
pub fn leak_dyn_nonprincipal() -> Box<PubPrincipal + PrivNonPrincipal> { loop {} }
8+
}
9+
10+
fn main() {
11+
m::leak_dyn_nonprincipal();
12+
//~^ ERROR type `(dyn m::PubPrincipal + m::PrivNonPrincipal + 'static)` is private
13+
}

‎src/test/ui/privacy/private-in-public-non-principal-2.stderr

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
error: type `(dyn m::PubPrincipal + m::PrivNonPrincipal + 'static)` is private
2+
--> $DIR/private-in-public-non-principal-2.rs:11:5
3+
|
4+
LL | m::leak_dyn_nonprincipal();
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
7+
error: aborting due to previous error
8+

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#![feature(optin_builtin_traits)]
2+
3+
pub trait PubPrincipal {}
4+
auto trait PrivNonPrincipal {}
5+
6+
pub fn leak_dyn_nonprincipal() -> Box<PubPrincipal + PrivNonPrincipal> { loop {} }
7+
//~^ WARN private type `(dyn PubPrincipal + PrivNonPrincipal + 'static)` in public interface
8+
//~| WARN this was previously accepted
9+
10+
#[deny(missing_docs)]
11+
fn container() {
12+
impl dyn PubPrincipal {
13+
pub fn check_doc_lint() {} //~ ERROR missing documentation for a method
14+
}
15+
impl dyn PubPrincipal + PrivNonPrincipal {
16+
pub fn check_doc_lint() {} // OK, no missing doc lint
17+
}
18+
}
19+
20+
fn main() {}

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
warning: private type `(dyn PubPrincipal + PrivNonPrincipal + 'static)` in public interface (error E0446)
2+
--> $DIR/private-in-public-non-principal.rs:6:1
3+
|
4+
LL | pub fn leak_dyn_nonprincipal() -> Box<PubPrincipal + PrivNonPrincipal> { loop {} }
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
|
7+
= note: #[warn(private_in_public)] on by default
8+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
9+
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
10+
11+
error: missing documentation for a method
12+
--> $DIR/private-in-public-non-principal.rs:13:9
13+
|
14+
LL | pub fn check_doc_lint() {} //~ ERROR missing documentation for a method
15+
| ^^^^^^^^^^^^^^^^^^^^^^^
16+
|
17+
note: lint level defined here
18+
--> $DIR/private-in-public-non-principal.rs:10:8
19+
|
20+
LL | #[deny(missing_docs)]
21+
| ^^^^^^^^^^^^
22+
23+
error: aborting due to previous error
24+

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,15 @@ mod aliases_pub {
213213
impl PrivUseAliasTr for <Priv as PrivTr>::AssocAlias {
214214
type Check = Priv; //~ ERROR private type `aliases_pub::Priv` in public interface
215215
}
216+
impl PrivUseAliasTr for Option<<Priv as PrivTr>::AssocAlias> {
217+
type Check = Priv; //~ ERROR private type `aliases_pub::Priv` in public interface
218+
}
219+
impl PrivUseAliasTr for (<Priv as PrivTr>::AssocAlias, Priv) {
220+
type Check = Priv; // OK
221+
}
222+
impl PrivUseAliasTr for Option<(<Priv as PrivTr>::AssocAlias, Priv)> {
223+
type Check = Priv; // OK
224+
}
216225
}
217226

218227
mod aliases_priv {

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -297,33 +297,42 @@ LL | struct Priv;
297297
LL | type Check = Priv; //~ ERROR private type `aliases_pub::Priv` in public interface
298298
| ^^^^^^^^^^^^^^^^^^ can't leak private type
299299

300+
error[E0446]: private type `aliases_pub::Priv` in public interface
301+
--> $DIR/private-in-public-warn.rs:217:9
302+
|
303+
LL | struct Priv;
304+
| - `aliases_pub::Priv` declared as private
305+
...
306+
LL | type Check = Priv; //~ ERROR private type `aliases_pub::Priv` in public interface
307+
| ^^^^^^^^^^^^^^^^^^ can't leak private type
308+
300309
error: private trait `aliases_priv::PrivTr1` in public interface (error E0445)
301-
--> $DIR/private-in-public-warn.rs:238:5
310+
--> $DIR/private-in-public-warn.rs:247:5
302311
|
303312
LL | pub trait Tr1: PrivUseAliasTr {}
304313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
305314
|
306315
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
307316
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
308317

309-
error: private type `aliases_priv::Priv2` in public interface (error E0446)
310-
--> $DIR/private-in-public-warn.rs:241:5
318+
error: private trait `aliases_priv::PrivTr1<aliases_priv::Priv2>` in public interface (error E0445)
319+
--> $DIR/private-in-public-warn.rs:250:5
311320
|
312321
LL | pub trait Tr2: PrivUseAliasTr<PrivAlias> {}
313322
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
314323
|
315324
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
316325
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
317326

318-
error: private trait `aliases_priv::PrivTr1<aliases_priv::Priv2>` in public interface (error E0445)
319-
--> $DIR/private-in-public-warn.rs:241:5
327+
error: private type `aliases_priv::Priv2` in public interface (error E0446)
328+
--> $DIR/private-in-public-warn.rs:250:5
320329
|
321330
LL | pub trait Tr2: PrivUseAliasTr<PrivAlias> {}
322331
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
323332
|
324333
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
325334
= note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
326335

327-
error: aborting due to 35 previous errors
336+
error: aborting due to 36 previous errors
328337

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ mod aliases_pub {
102102

103103
// This should be OK, but associated type aliases are not substituted yet
104104
pub fn f3(arg: <Priv as PrivTr>::Assoc) {}
105-
//~^ ERROR private type `<aliases_pub::Priv as aliases_pub::PrivTr>::Assoc` in public interface
105+
//~^ ERROR private trait `aliases_pub::PrivTr` in public interface
106106
//~| ERROR private type `aliases_pub::Priv` in public interface
107107

108108
impl PrivUseAlias {
@@ -131,7 +131,7 @@ mod aliases_priv {
131131
pub fn f1(arg: PrivUseAlias) {} //~ ERROR private type `aliases_priv::Priv1` in public interface
132132
pub fn f2(arg: PrivAlias) {} //~ ERROR private type `aliases_priv::Priv2` in public interface
133133
pub fn f3(arg: <Priv as PrivTr>::Assoc) {}
134-
//~^ ERROR private type `<aliases_priv::Priv as aliases_priv::PrivTr>::Assoc` in public
134+
//~^ ERROR private trait `aliases_priv::PrivTr` in public interface
135135
//~| ERROR private type `aliases_priv::Priv` in public interface
136136
}
137137

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

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,24 +82,36 @@ LL | pub fn f2() -> Priv { panic!() } //~ ERROR private type `types::Pri
8282
error[E0445]: private trait `traits::PrivTr` in public interface
8383
--> $DIR/private-in-public.rs:31:5
8484
|
85+
LL | trait PrivTr {}
86+
| - `traits::PrivTr` declared as private
87+
...
8588
LL | pub enum E<T: PrivTr> { V(T) } //~ ERROR private trait `traits::PrivTr` in public interface
8689
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
8790

8891
error[E0445]: private trait `traits::PrivTr` in public interface
8992
--> $DIR/private-in-public.rs:32:5
9093
|
94+
LL | trait PrivTr {}
95+
| - `traits::PrivTr` declared as private
96+
...
9197
LL | pub fn f<T: PrivTr>(arg: T) {} //~ ERROR private trait `traits::PrivTr` in public interface
9298
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
9399

94100
error[E0445]: private trait `traits::PrivTr` in public interface
95101
--> $DIR/private-in-public.rs:33:5
96102
|
103+
LL | trait PrivTr {}
104+
| - `traits::PrivTr` declared as private
105+
...
97106
LL | pub struct S1<T: PrivTr>(T); //~ ERROR private trait `traits::PrivTr` in public interface
98107
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
99108

100109
error[E0445]: private trait `traits::PrivTr` in public interface
101110
--> $DIR/private-in-public.rs:34:5
102111
|
112+
LL | trait PrivTr {}
113+
| - `traits::PrivTr` declared as private
114+
...
103115
LL | / impl<T: PrivTr> Pub<T> { //~ ERROR private trait `traits::PrivTr` in public interface
104116
LL | | pub fn f<U: PrivTr>(arg: U) {} //~ ERROR private trait `traits::PrivTr` in public interface
105117
LL | | }
@@ -108,30 +120,45 @@ LL | | }
108120
error[E0445]: private trait `traits::PrivTr` in public interface
109121
--> $DIR/private-in-public.rs:35:9
110122
|
123+
LL | trait PrivTr {}
124+
| - `traits::PrivTr` declared as private
125+
...
111126
LL | pub fn f<U: PrivTr>(arg: U) {} //~ ERROR private trait `traits::PrivTr` in public interface
112127
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
113128

114129
error[E0445]: private trait `traits_where::PrivTr` in public interface
115130
--> $DIR/private-in-public.rs:44:5
116131
|
132+
LL | trait PrivTr {}
133+
| - `traits_where::PrivTr` declared as private
134+
...
117135
LL | pub enum E<T> where T: PrivTr { V(T) }
118136
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
119137

120138
error[E0445]: private trait `traits_where::PrivTr` in public interface
121139
--> $DIR/private-in-public.rs:46:5
122140
|
141+
LL | trait PrivTr {}
142+
| - `traits_where::PrivTr` declared as private
143+
...
123144
LL | pub fn f<T>(arg: T) where T: PrivTr {}
124145
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
125146

126147
error[E0445]: private trait `traits_where::PrivTr` in public interface
127148
--> $DIR/private-in-public.rs:48:5
128149
|
150+
LL | trait PrivTr {}
151+
| - `traits_where::PrivTr` declared as private
152+
...
129153
LL | pub struct S1<T>(T) where T: PrivTr;
130154
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
131155

132156
error[E0445]: private trait `traits_where::PrivTr` in public interface
133157
--> $DIR/private-in-public.rs:50:5
134158
|
159+
LL | trait PrivTr {}
160+
| - `traits_where::PrivTr` declared as private
161+
...
135162
LL | / impl<T> Pub<T> where T: PrivTr {
136163
LL | | //~^ ERROR private trait `traits_where::PrivTr` in public interface
137164
LL | | pub fn f<U>(arg: U) where U: PrivTr {}
@@ -142,6 +169,9 @@ LL | | }
142169
error[E0445]: private trait `traits_where::PrivTr` in public interface
143170
--> $DIR/private-in-public.rs:52:9
144171
|
172+
LL | trait PrivTr {}
173+
| - `traits_where::PrivTr` declared as private
174+
...
145175
LL | pub fn f<U>(arg: U) where U: PrivTr {}
146176
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
147177

@@ -181,14 +211,14 @@ LL | struct Priv;
181211
LL | pub fn f(arg: Priv) {} //~ ERROR private type `impls::Priv` in public interface
182212
| ^^^^^^^^^^^^^^^^^^^^^^ can't leak private type
183213

184-
error[E0446]: private type `<aliases_pub::Priv as aliases_pub::PrivTr>::Assoc` in public interface
214+
error[E0445]: private trait `aliases_pub::PrivTr` in public interface
185215
--> $DIR/private-in-public.rs:104:5
186216
|
187217
LL | trait PrivTr {
188-
| - `<aliases_pub::Priv as aliases_pub::PrivTr>::Assoc` declared as private
218+
| - `aliases_pub::PrivTr` declared as private
189219
...
190220
LL | pub fn f3(arg: <Priv as PrivTr>::Assoc) {}
191-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type
221+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
192222

193223
error[E0446]: private type `aliases_pub::Priv` in public interface
194224
--> $DIR/private-in-public.rs:104:5
@@ -226,14 +256,14 @@ LL | struct Priv2;
226256
LL | pub fn f2(arg: PrivAlias) {} //~ ERROR private type `aliases_priv::Priv2` in public interface
227257
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type
228258

229-
error[E0446]: private type `<aliases_priv::Priv as aliases_priv::PrivTr>::Assoc` in public interface
259+
error[E0445]: private trait `aliases_priv::PrivTr` in public interface
230260
--> $DIR/private-in-public.rs:133:5
231261
|
232262
LL | trait PrivTr {
233-
| - `<aliases_priv::Priv as aliases_priv::PrivTr>::Assoc` declared as private
263+
| - `aliases_priv::PrivTr` declared as private
234264
...
235265
LL | pub fn f3(arg: <Priv as PrivTr>::Assoc) {}
236-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type
266+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
237267

238268
error[E0446]: private type `aliases_priv::Priv` in public interface
239269
--> $DIR/private-in-public.rs:133:5

0 commit comments

Comments
 (0)