diff options
| author | bors <bors@rust-lang.org> | 2023-05-14 02:53:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-14 02:53:52 +0000 |
| commit | ad6ab11234ae885913229f6de2c4465bdc0d76f3 (patch) | |
| tree | df2d714cb3a3e3298d560a88335d38d2d4cefe1a /compiler/rustc_resolve/src | |
| parent | 2e18605af29ccf875cdcb539a522f11f5ac44113 (diff) | |
| parent | 670f5b134e5dcb43e88d5c59f716058d320a2265 (diff) | |
| download | rust-ad6ab11234ae885913229f6de2c4465bdc0d76f3.tar.gz rust-ad6ab11234ae885913229f6de2c4465bdc0d76f3.zip | |
Auto merge of #111425 - Bryanskiy:privacy_ef, r=petrochenkov
Populate effective visibilities in `rustc_privacy` (take 2) Same as https://github.com/rust-lang/rust/pull/110907 + regressions fixes. Fixes https://github.com/rust-lang/rust/issues/111359. r? `@petrochenkov`
Diffstat (limited to 'compiler/rustc_resolve/src')
| -rw-r--r-- | compiler/rustc_resolve/src/effective_visibilities.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_resolve/src/effective_visibilities.rs b/compiler/rustc_resolve/src/effective_visibilities.rs index 87067189a77..7393bdb388a 100644 --- a/compiler/rustc_resolve/src/effective_visibilities.rs +++ b/compiler/rustc_resolve/src/effective_visibilities.rs @@ -199,7 +199,7 @@ impl<'r, 'a, 'tcx> EffectiveVisibilitiesVisitor<'r, 'a, 'tcx> { let tcx = self.r.tcx; self.changed |= self.import_effective_visibilities.update( binding, - nominal_vis, + Some(nominal_vis), || cheap_private_vis.unwrap_or_else(|| self.r.private_vis_import(binding)), inherited_eff_vis, parent_id.level(), @@ -213,7 +213,7 @@ impl<'r, 'a, 'tcx> EffectiveVisibilitiesVisitor<'r, 'a, 'tcx> { let tcx = self.r.tcx; self.changed |= self.def_effective_visibilities.update( def_id, - nominal_vis, + Some(nominal_vis), || cheap_private_vis.unwrap_or_else(|| self.r.private_vis_def(def_id)), inherited_eff_vis, parent_id.level(), |