Merge #7768

7768: Fix visibility computation when inside a block expression r=jonas-schievink a=jonas-schievink

fixes https://github.com/rust-analyzer/rust-analyzer/issues/7728

bors r+

Co-authored-by: Jonas Schievink <[email protected]>

1 files changed, 2 insertions, 2 deletions

diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
index 6bd41bc08..9996a0807 100644
--- a/crates/hir_def/src/nameres/collector.rs
+++ b/crates/hir_def/src/nameres/collector.rs
@@ -608,7 +608,7 @@ impl DefCollector<'_> {
                                 (
                                     n,
                                     res.filter_visibility(|v| {
-                                        v.is_visible_from_def_map(&self.def_map, module_id)
+                                        v.is_visible_from_def_map(self.db, &self.def_map, module_id)
                                     }),
                                 )
                             })
@@ -761,7 +761,7 @@ impl DefCollector<'_> {
             .filter(|(glob_importing_module, _)| {
                 // we know all resolutions have the same visibility (`vis`), so we
                 // just need to check that once
-                vis.is_visible_from_def_map(&self.def_map, *glob_importing_module)
+                vis.is_visible_from_def_map(self.db, &self.def_map, *glob_importing_module)
             })
             .cloned()
             .collect::<Vec<_>>();