bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

resolve: determined binding after parent module macro expand

Browse source
This commit is contained in:
bohan 2023-09-04 20:14:40 +08:00
parent 1fe747c160
commit f1536507e1
14 changed files with 154 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_resolve/src/ident.rs
View file

@ -972,9 +972,8 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
// progress, we have to ignore those potential unresolved invocations from other modules
// and prohibit access to macro-expanded `macro_export` macros instead (unless restricted
// shadowing is enabled, see `macro_expanded_macro_export_errors`).
let unexpanded_macros = !module.unexpanded_invocations.borrow().is_empty();
if let Some(binding) = binding {
if !unexpanded_macros || ns == MacroNS || restricted_shadowing {
if binding.determined() || ns == MacroNS || restricted_shadowing {
return check_usable(self, binding);
} else {
return Err((Undetermined, Weak::No));
@ -991,7 +990,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
// Check if one of unexpanded macros can still define the name,
// if it can then our "no resolution" result is not determined and can be invalidated.
if unexpanded_macros {
if !module.unexpanded_invocations.borrow().is_empty() {
return Err((Undetermined, Weak::Yes));
}