Skip to content

Commit e82b9dc

Browse files
petrochenkovpetrochenkov
committed
privacy: Visit DefIds once in DefIdVisitorSkeleton 
1 parent 9988115 commit e82b9dc

File tree

7 files changed

+41
-64
lines changed

7 files changed

+41
-64
lines changed

‎compiler/rustc_privacy/src/lib.rs‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,16 @@ pub trait DefIdVisitor<'tcx> {
7575
}
7676

7777
fn tcx(&self) -> TyCtxt<'tcx>;
78+
/// NOTE: Def-id visiting should be idempotent, because `DefIdVisitorSkeleton` will avoid
79+
/// visiting duplicate def-ids. All the current visitors follow this rule.
7880
fn visit_def_id(&mut self, def_id: DefId, kind: &str, descr: &dyn fmt::Display)
7981
-> Self::Result;
8082

8183
/// Not overridden, but used to actually visit types and traits.
8284
fn skeleton(&mut self) -> DefIdVisitorSkeleton<'_, 'tcx, Self> {
8385
DefIdVisitorSkeleton {
8486
def_id_visitor: self,
85-
visited_opaque_tys: Default::default(),
87+
visited_def_ids: Default::default(),
8688
dummy: Default::default(),
8789
}
8890
}
@@ -102,7 +104,7 @@ pub trait DefIdVisitor<'tcx> {
102104

103105
pub struct DefIdVisitorSkeleton<'v, 'tcx, V: ?Sized> {
104106
def_id_visitor: &'v mut V,
105-
visited_opaque_tys: FxHashSet<DefId>,
107+
visited_def_ids: FxHashSet<DefId>,
106108
dummy: PhantomData<TyCtxt<'tcx>>,
107109
}
108110

@@ -112,11 +114,13 @@ where
112114
{
113115
fn visit_trait(&mut self, trait_ref: TraitRef<'tcx>) -> V::Result {
114116
let TraitRef { def_id, args, .. } = trait_ref;
115-
try_visit!(self.def_id_visitor.visit_def_id(
116-
def_id,
117-
"trait",
118-
&trait_ref.print_only_trait_path()
119-
));
117+
if self.visited_def_ids.insert(def_id) {
118+
try_visit!(self.def_id_visitor.visit_def_id(
119+
def_id,
120+
"trait",
121+
&trait_ref.print_only_trait_path()
122+
));
123+
}
120124
if V::SHALLOW { V::Result::output() } else { args.visit_with(self) }
121125
}
122126

@@ -190,7 +194,9 @@ where
190194
| ty::Closure(def_id, ..)
191195
| ty::CoroutineClosure(def_id, ..)
192196
| ty::Coroutine(def_id, ..) => {
193-
try_visit!(self.def_id_visitor.visit_def_id(def_id, "type", &ty));
197+
if self.visited_def_ids.insert(def_id) {
198+
try_visit!(self.def_id_visitor.visit_def_id(def_id, "type", &ty));
199+
}
194200
if V::SHALLOW {
195201
return V::Result::output();
196202
}
@@ -221,15 +227,17 @@ where
221227
return V::Result::output();
222228
}
223229

224-
try_visit!(self.def_id_visitor.visit_def_id(
225-
data.def_id,
226-
match kind {
227-
ty::Inherent | ty::Projection => "associated type",
228-
ty::Free => "type alias",
229-
ty::Opaque => unreachable!(),
230-
},
231-
&LazyDefPathStr { def_id: data.def_id, tcx },
232-
));
230+
if self.visited_def_ids.insert(data.def_id) {
231+
try_visit!(self.def_id_visitor.visit_def_id(
232+
data.def_id,
233+
match kind {
234+
ty::Inherent | ty::Projection => "associated type",
235+
ty::Free => "type alias",
236+
ty::Opaque => unreachable!(),
237+
},
238+
&LazyDefPathStr { def_id: data.def_id, tcx },
239+
));
240+
}
233241

234242
// This will also visit args if necessary, so we don't need to recurse.
235243
return if V::SHALLOW {
@@ -254,12 +262,14 @@ where
254262
}
255263
};
256264
let ty::ExistentialTraitRef { def_id, .. } = trait_ref;
257-
try_visit!(self.def_id_visitor.visit_def_id(def_id, "trait", &trait_ref));
265+
if self.visited_def_ids.insert(def_id) {
266+
try_visit!(self.def_id_visitor.visit_def_id(def_id, "trait", &trait_ref));
267+
}
258268
}
259269
}
260270
ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }) => {
261271
// Skip repeated `Opaque`s to avoid infinite recursion.
262-
if self.visited_opaque_tys.insert(def_id) {
272+
if self.visited_def_ids.insert(def_id) {
263273
// The intent is to treat `impl Trait1 + Trait2` identically to
264274
// `dyn Trait1 + Trait2`. Therefore we ignore def-id of the opaque type itself
265275
// (it either has no visibility, or its visibility is insignificant, like

‎tests/ui/const-generics/generic_const_exprs/eval-privacy.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ where
1616
{
1717
type AssocTy = Const<{ my_const_fn(U) }>;
1818
//~^ ERROR private type
19-
//~| ERROR private type
2019
fn assoc_fn() -> Self::AssocTy {
2120
Const
2221
}

‎tests/ui/const-generics/generic_const_exprs/eval-privacy.stderr‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,6 @@ LL | type AssocTy = Const<{ my_const_fn(U) }>;
77
LL | const fn my_const_fn(val: u8) -> u8 {
88
| ----------------------------------- `fn(u8) -> u8 {my_const_fn}` declared as private
99

10-
error[E0446]: private type `fn(u8) -> u8 {my_const_fn}` in public interface
11-
--> $DIR/eval-privacy.rs:17:5
12-
|
13-
LL | type AssocTy = Const<{ my_const_fn(U) }>;
14-
| ^^^^^^^^^^^^ can't leak private type
15-
...
16-
LL | const fn my_const_fn(val: u8) -> u8 {
17-
| ----------------------------------- `fn(u8) -> u8 {my_const_fn}` declared as private
18-
|
19-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
20-
21-
error: aborting due to 2 previous errors
10+
error: aborting due to 1 previous error
2211

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

‎tests/ui/privacy/pub-priv-dep/pub-priv1.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ impl From<PublicWithStdImpl> for OtherType {
145145
//~| ERROR type `OtherType` from private dependency 'priv_dep' in public interface
146146
fn from(val: PublicWithStdImpl) -> Self { Self }
147147
//~^ ERROR type `OtherType` from private dependency 'priv_dep' in public interface
148-
//~| ERROR type `OtherType` from private dependency 'priv_dep' in public interface
149148
}
150149

151150
pub struct AllowedPrivType {

‎tests/ui/privacy/pub-priv-dep/pub-priv1.stderr‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,55 @@ LL | #![deny(exported_private_dependencies)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error: macro `m` from private dependency 'priv_dep' is re-exported
14-
--> $DIR/pub-priv1.rs:156:9
14+
--> $DIR/pub-priv1.rs:155:9
1515
|
1616
LL | pub use priv_dep::m;
1717
| ^^^^^^^^^^^
1818

1919
error: macro `fn_like` from private dependency 'pm' is re-exported
20-
--> $DIR/pub-priv1.rs:158:9
20+
--> $DIR/pub-priv1.rs:157:9
2121
|
2222
LL | pub use pm::fn_like;
2323
| ^^^^^^^^^^^
2424

2525
error: derive macro `PmDerive` from private dependency 'pm' is re-exported
26-
--> $DIR/pub-priv1.rs:160:9
26+
--> $DIR/pub-priv1.rs:159:9
2727
|
2828
LL | pub use pm::PmDerive;
2929
| ^^^^^^^^^^^^
3030

3131
error: attribute macro `pm_attr` from private dependency 'pm' is re-exported
32-
--> $DIR/pub-priv1.rs:162:9
32+
--> $DIR/pub-priv1.rs:161:9
3333
|
3434
LL | pub use pm::pm_attr;
3535
| ^^^^^^^^^^^
3636

3737
error: variant `V1` from private dependency 'priv_dep' is re-exported
38-
--> $DIR/pub-priv1.rs:165:9
38+
--> $DIR/pub-priv1.rs:164:9
3939
|
4040
LL | pub use priv_dep::E::V1;
4141
| ^^^^^^^^^^^^^^^
4242

4343
error: type alias `Unit` from private dependency 'priv_dep' is re-exported
44-
--> $DIR/pub-priv1.rs:168:9
44+
--> $DIR/pub-priv1.rs:167:9
4545
|
4646
LL | pub use priv_dep::Unit;
4747
| ^^^^^^^^^^^^^^
4848

4949
error: type alias `PubPub` from private dependency 'priv_dep' is re-exported
50-
--> $DIR/pub-priv1.rs:170:9
50+
--> $DIR/pub-priv1.rs:169:9
5151
|
5252
LL | pub use priv_dep::PubPub;
5353
| ^^^^^^^^^^^^^^^^
5454

5555
error: type alias `PubPriv` from private dependency 'priv_dep' is re-exported
56-
--> $DIR/pub-priv1.rs:172:9
56+
--> $DIR/pub-priv1.rs:171:9
5757
|
5858
LL | pub use priv_dep::PubPriv;
5959
| ^^^^^^^^^^^^^^^^^
6060

6161
error: struct `Renamed` from private dependency 'priv_dep' is re-exported
62-
--> $DIR/pub-priv1.rs:174:9
62+
--> $DIR/pub-priv1.rs:173:9
6363
|
6464
LL | pub use priv_dep::OtherType as Renamed;
6565
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -248,13 +248,5 @@ error: type `OtherType` from private dependency 'priv_dep' in public interface
248248
LL | fn from(val: PublicWithStdImpl) -> Self { Self }
249249
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
250250

251-
error: type `OtherType` from private dependency 'priv_dep' in public interface
252-
--> $DIR/pub-priv1.rs:146:5
253-
|
254-
LL | fn from(val: PublicWithStdImpl) -> Self { Self }
255-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
256-
|
257-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
258-
259-
error: aborting due to 41 previous errors
251+
error: aborting due to 40 previous errors
260252

‎tests/ui/privacy/where-priv-type.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ where
6565
{
6666
type AssocTy = Const<{ my_const_fn(U) }>;
6767
//~^ ERROR private type
68-
//~| ERROR private type
6968
fn assoc_fn() -> Self::AssocTy {
7069
Const
7170
}

‎tests/ui/privacy/where-priv-type.stderr‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,6 @@ LL | type AssocTy = Const<{ my_const_fn(U) }>;
7777
LL | const fn my_const_fn(val: u8) -> u8 {
7878
| ----------------------------------- `fn(u8) -> u8 {my_const_fn}` declared as private
7979

80-
error[E0446]: private type `fn(u8) -> u8 {my_const_fn}` in public interface
81-
--> $DIR/where-priv-type.rs:66:5
82-
|
83-
LL | type AssocTy = Const<{ my_const_fn(U) }>;
84-
| ^^^^^^^^^^^^ can't leak private type
85-
...
86-
LL | const fn my_const_fn(val: u8) -> u8 {
87-
| ----------------------------------- `fn(u8) -> u8 {my_const_fn}` declared as private
88-
|
89-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
90-
91-
error: aborting due to 2 previous errors; 5 warnings emitted
80+
error: aborting due to 1 previous error; 5 warnings emitted
9281

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

0 commit comments

Comments
 (0)