nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-16 17:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace the restricted_shadowing boolean argument with an enum.

Browse Source 
It makes the code clearer.
This commit is contained in:
Nicholas Nethercote 2024-11-14 10:20:45 +11:00
parent 6e0e9edbe0
commit 66cc7d6a05
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
compiler/rustc_resolve/src/ident.rs
View File

@ -38,6 +38,12 @@ impl From<UsePrelude> for bool {
} }
} }
#[derive(Debug, PartialEq)]
enum Shadowing {
Restricted,
Unrestricted,
}
impl<'ra, 'tcx> Resolver<'ra, 'tcx> { impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
/// A generic scope visitor. /// A generic scope visitor.
/// Visits scopes in order to resolve some identifier in them or perform other actions. /// Visits scopes in order to resolve some identifier in them or perform other actions.
@ -349,7 +355,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
ident, ident,
ns, ns,
parent_scope, parent_scope,
false, Shadowing::Unrestricted,
finalize.map(|finalize| Finalize { used: Used::Scope, ..finalize }), finalize.map(|finalize| Finalize { used: Used::Scope, ..finalize }),
ignore_binding, ignore_binding,
None, None,
@ -521,7 +527,11 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
ident, ident,
ns, ns,
adjusted_parent_scope, adjusted_parent_scope,
!matches!(scope_set, ScopeSet::Late(..)), if matches!(scope_set, ScopeSet::Late(..)) {
Shadowing::Unrestricted
} else {
Shadowing::Restricted
},
finalize.map(|finalize| Finalize { used: Used::Scope, ..finalize }), finalize.map(|finalize| Finalize { used: Used::Scope, ..finalize }),
ignore_binding, ignore_binding,
ignore_import, ignore_import,
@ -590,7 +600,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
ident, ident,
ns, ns,
parent_scope, parent_scope,
false, Shadowing::Unrestricted,
None, None,
ignore_binding, ignore_binding,
ignore_import, ignore_import,
@ -786,7 +796,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
ident, ident,
ns, ns,
adjusted_parent_scope, adjusted_parent_scope,
false, Shadowing::Unrestricted,
finalize, finalize,
ignore_binding, ignore_binding,
ignore_import, ignore_import,
@ -802,7 +812,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
ident: Ident, ident: Ident,
ns: Namespace, ns: Namespace,
parent_scope: &ParentScope<'ra>, parent_scope: &ParentScope<'ra>,
restricted_shadowing: bool, shadowing: Shadowing,
finalize: Option<Finalize>, finalize: Option<Finalize>,
// This binding should be ignored during in-module resolution, so that we don't get // This binding should be ignored during in-module resolution, so that we don't get
// "self-confirming" import resolutions during import validation and checking. // "self-confirming" import resolutions during import validation and checking.
@ -812,7 +822,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
let module = match module { let module = match module {
ModuleOrUniformRoot::Module(module) => module, ModuleOrUniformRoot::Module(module) => module,
ModuleOrUniformRoot::CrateRootAndExternPrelude => { ModuleOrUniformRoot::CrateRootAndExternPrelude => {
assert!(!restricted_shadowing); assert_eq!(shadowing, Shadowing::Unrestricted);
let binding = self.early_resolve_ident_in_lexical_scope( let binding = self.early_resolve_ident_in_lexical_scope(
ident, ident,
ScopeSet::AbsolutePath(ns), ScopeSet::AbsolutePath(ns),
@ -825,7 +835,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
return binding.map_err(|determinacy| (determinacy, Weak::No)); return binding.map_err(|determinacy| (determinacy, Weak::No));
} }
ModuleOrUniformRoot::ExternPrelude => { ModuleOrUniformRoot::ExternPrelude => {
assert!(!restricted_shadowing); assert_eq!(shadowing, Shadowing::Unrestricted);
return if ns != TypeNS { return if ns != TypeNS {
Err((Determined, Weak::No)) Err((Determined, Weak::No))
} else if let Some(binding) = self.extern_prelude_get(ident, finalize.is_some()) { } else if let Some(binding) = self.extern_prelude_get(ident, finalize.is_some()) {
@ -838,7 +848,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
}; };
} }
ModuleOrUniformRoot::CurrentScope => { ModuleOrUniformRoot::CurrentScope => {
assert!(!restricted_shadowing); assert_eq!(shadowing, Shadowing::Unrestricted);
if ns == TypeNS { if ns == TypeNS {
if ident.name == kw::Crate || ident.name == kw::DollarCrate { if ident.name == kw::Crate || ident.name == kw::DollarCrate {
let module = self.resolve_crate_root(ident); let module = self.resolve_crate_root(ident);
@ -897,7 +907,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
// Forbid expanded shadowing to avoid time travel. // Forbid expanded shadowing to avoid time travel.
if let Some(shadowed_glob) = resolution.shadowed_glob if let Some(shadowed_glob) = resolution.shadowed_glob
&& restricted_shadowing && shadowing == Shadowing::Restricted
&& binding.expansion != LocalExpnId::ROOT && binding.expansion != LocalExpnId::ROOT
&& binding.res() != shadowed_glob.res() && binding.res() != shadowed_glob.res()
{ {
@ -912,7 +922,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
}); });
} }
if !restricted_shadowing if shadowing == Shadowing::Unrestricted
&& binding.expansion != LocalExpnId::ROOT && binding.expansion != LocalExpnId::ROOT
&& let NameBindingKind::Import { import, .. } = binding.kind && let NameBindingKind::Import { import, .. } = binding.kind
&& matches!(import.kind, ImportKind::MacroExport) && matches!(import.kind, ImportKind::MacroExport)
@ -1024,7 +1034,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
// and prohibit access to macro-expanded `macro_export` macros instead (unless restricted // and prohibit access to macro-expanded `macro_export` macros instead (unless restricted
// shadowing is enabled, see `macro_expanded_macro_export_errors`). // shadowing is enabled, see `macro_expanded_macro_export_errors`).
if let Some(binding) = binding { if let Some(binding) = binding {
if binding.determined() || ns == MacroNS || restricted_shadowing { if binding.determined() || ns == MacroNS || shadowing == Shadowing::Restricted {
return check_usable(self, binding); return check_usable(self, binding);
} else { } else {
return Err((Undetermined, Weak::No)); return Err((Undetermined, Weak::No));
@ -1076,7 +1086,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
ident, ident,
ns, ns,
adjusted_parent_scope, adjusted_parent_scope,
false, Shadowing::Unrestricted,
None, None,
ignore_binding, ignore_binding,
ignore_import, ignore_import,