Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #18605 from ChayimFriedman2/wildcard-imports

Browse source 
fix: Fixed another bug with glob imports
This commit is contained in:
Lukas Wirth 2024-12-04 05:15:46 +00:00 committed by GitHub
commit 4b4cec882a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/hir-def/src/nameres/collector.rs
View file

@ -910,8 +910,13 @@ impl DefCollector<'_> {
self.update(module_id, &items, vis, Some(ImportType::Glob(id)));
// record the glob import in case we add further items
let glob = self.glob_imports.entry(m.local_id).or_default();
if !glob.iter().any(|(mid, _, _)| *mid == module_id) {
glob.push((module_id, vis, id));
match glob.iter_mut().find(|(mid, _, _)| *mid == module_id) {
None => glob.push((module_id, vis, id)),
Some((_, old_vis, _)) => {
if let Some(new_vis) = old_vis.max(vis, &self.def_map) {
*old_vis = new_vis;
}
}
}
}
}

39
crates/hir-def/src/nameres/tests/globs.rs
View file

@ -451,3 +451,42 @@ mod glob_target {
"#]],
);
}
#[test]
fn regression_18580() {
check(
r#"
pub mod libs {
pub struct Placeholder;
}
pub mod reexport_2 {
use reexport_1::*;
pub use reexport_1::*;
pub mod reexport_1 {
pub use crate::libs::*;
}
}
use reexport_2::*;
"#,
expect![[r#"
crate
Placeholder: t v
libs: t
reexport_1: t
reexport_2: t
crate::libs
Placeholder: t v
crate::reexport_2
Placeholder: t v
reexport_1: t
crate::reexport_2::reexport_1
Placeholder: t v
"#]],
);
}