bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

fix(resolve): update shadowed_glob more precision

Browse source
This commit is contained in:
bohan 2023-06-14 00:55:36 +08:00
parent 4bd4e2ea82
commit f7330eb752
4 changed files with 55 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_resolve/src/imports.rs
View file

@ -338,7 +338,21 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
} else {
resolution.binding = Some(nonglob_binding);
}
resolution.shadowed_glob = Some(glob_binding);
if let Some(old_binding) = resolution.shadowed_glob {
assert!(old_binding.is_glob_import());
if glob_binding.res() != old_binding.res() {
resolution.shadowed_glob = Some(this.ambiguity(
AmbiguityKind::GlobVsGlob,
old_binding,
glob_binding,
));
} else if !old_binding.vis.is_at_least(binding.vis, this.tcx) {
resolution.shadowed_glob = Some(glob_binding);
}
} else {
resolution.shadowed_glob = Some(glob_binding);
}
}
(false, false) => {
return Err(old_binding);