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

resolve: Rename unusable_binding to ignore_binding

Browse Source
This commit is contained in:
Vadim Petrochenkov 2022-04-30 18:01:01 +03:00
parent f0e0434feb
commit 7841247ca9
4 changed files with 41 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_resolve/src/diagnostics.rs
View File

@ -1807,7 +1807,7 @@ impl<'a> Resolver<'a> {
opt_ns: Option<Namespace>, // `None` indicates a module path in import opt_ns: Option<Namespace>, // `None` indicates a module path in import
parent_scope: &ParentScope<'a>, parent_scope: &ParentScope<'a>,
ribs: Option<&PerNS<Vec<Rib<'a>>>>, ribs: Option<&PerNS<Vec<Rib<'a>>>>,
unusable_binding: Option<&'a NameBinding<'a>>, ignore_binding: Option<&'a NameBinding<'a>>,
module: Option<ModuleOrUniformRoot<'a>>, module: Option<ModuleOrUniformRoot<'a>>,
i: usize, i: usize,
ident: Ident, ident: Ident,
@ -1859,7 +1859,7 @@ impl<'a> Resolver<'a> {
ns_to_try, ns_to_try,
parent_scope, parent_scope,
None, None,
unusable_binding, ignore_binding,
).ok() ).ok()
} else if let Some(ribs) = ribs } else if let Some(ribs) = ribs
&& let Some(TypeNS | ValueNS) = opt_ns && let Some(TypeNS | ValueNS) = opt_ns
@ -1870,7 +1870,7 @@ impl<'a> Resolver<'a> {
parent_scope, parent_scope,
None, None,
&ribs[ns_to_try], &ribs[ns_to_try],
unusable_binding, ignore_binding,
) { ) {
// we found a locally-imported or available item/module // we found a locally-imported or available item/module
Some(LexicalScopeBinding::Item(binding)) => Some(binding), Some(LexicalScopeBinding::Item(binding)) => Some(binding),
@ -1884,7 +1884,7 @@ impl<'a> Resolver<'a> {
parent_scope, parent_scope,
None, None,
false, false,
unusable_binding, ignore_binding,
).ok() ).ok()
}; };
if let Some(binding) = binding { if let Some(binding) = binding {
@ -1917,7 +1917,7 @@ impl<'a> Resolver<'a> {
parent_scope, parent_scope,
None, None,
&ribs[ValueNS], &ribs[ValueNS],
unusable_binding, ignore_binding,
) )
} else { } else {
None None

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

@ -281,7 +281,7 @@ impl<'a> Resolver<'a> {
parent_scope: &ParentScope<'a>, parent_scope: &ParentScope<'a>,
finalize: Option<Finalize>, finalize: Option<Finalize>,
ribs: &[Rib<'a>], ribs: &[Rib<'a>],
unusable_binding: Option<&'a NameBinding<'a>>, ignore_binding: Option<&'a NameBinding<'a>>,
) -> Option<LexicalScopeBinding<'a>> { ) -> Option<LexicalScopeBinding<'a>> {
assert!(ns == TypeNS || ns == ValueNS); assert!(ns == TypeNS || ns == ValueNS);
let orig_ident = ident; let orig_ident = ident;
@ -343,7 +343,7 @@ impl<'a> Resolver<'a> {
ns, ns,
parent_scope, parent_scope,
finalize, finalize,
unusable_binding, ignore_binding,
); );
if let Ok(binding) = item { if let Ok(binding) = item {
// The ident resolves to an item. // The ident resolves to an item.
@ -356,7 +356,7 @@ impl<'a> Resolver<'a> {
parent_scope, parent_scope,
finalize, finalize,
finalize.is_some(), finalize.is_some(),
unusable_binding, ignore_binding,
) )
.ok() .ok()
.map(LexicalScopeBinding::Item) .map(LexicalScopeBinding::Item)
@ -375,7 +375,7 @@ impl<'a> Resolver<'a> {
parent_scope: &ParentScope<'a>, parent_scope: &ParentScope<'a>,
finalize: Option<Finalize>, finalize: Option<Finalize>,
force: bool, force: bool,
unusable_binding: Option<&'a NameBinding<'a>>, ignore_binding: Option<&'a NameBinding<'a>>,
) -> Result<&'a NameBinding<'a>, Determinacy> { ) -> Result<&'a NameBinding<'a>, Determinacy> {
bitflags::bitflags! { bitflags::bitflags! {
struct Flags: u8 { struct Flags: u8 {
@ -495,7 +495,7 @@ impl<'a> Resolver<'a> {
ns, ns,
parent_scope, parent_scope,
finalize, finalize,
unusable_binding, ignore_binding,
); );
match binding { match binding {
Ok(binding) => Ok((binding, Flags::MODULE | Flags::MISC_SUGGEST_CRATE)), Ok(binding) => Ok((binding, Flags::MODULE | Flags::MISC_SUGGEST_CRATE)),
@ -517,7 +517,7 @@ impl<'a> Resolver<'a> {
adjusted_parent_scope, adjusted_parent_scope,
!matches!(scope_set, ScopeSet::Late(..)), !matches!(scope_set, ScopeSet::Late(..)),
finalize, finalize,
unusable_binding, ignore_binding,
); );
match binding { match binding {
Ok(binding) => { Ok(binding) => {
@ -602,7 +602,7 @@ impl<'a> Resolver<'a> {
ns, ns,
parent_scope, parent_scope,
None, None,
unusable_binding, ignore_binding,
) { ) {
if use_prelude || this.is_builtin_macro(binding.res()) { if use_prelude || this.is_builtin_macro(binding.res()) {
result = Ok((binding, Flags::MISC_FROM_PRELUDE)); result = Ok((binding, Flags::MISC_FROM_PRELUDE));
@ -736,19 +736,10 @@ impl<'a> Resolver<'a> {
ns: Namespace, ns: Namespace,
parent_scope: &ParentScope<'a>, parent_scope: &ParentScope<'a>,
finalize: Option<Finalize>, finalize: Option<Finalize>,
// This binding should be ignored during in-module resolution, so that we don't get ignore_binding: Option<&'a NameBinding<'a>>,
// "self-confirming" import resolutions during import validation.
unusable_binding: Option<&'a NameBinding<'a>>,
) -> Result<&'a NameBinding<'a>, Determinacy> { ) -> Result<&'a NameBinding<'a>, Determinacy> {
self.resolve_ident_in_module_ext( self.resolve_ident_in_module_ext(module, ident, ns, parent_scope, finalize, ignore_binding)
module, .map_err(|(determinacy, _)| determinacy)
ident,
ns,
parent_scope,
finalize,
unusable_binding,
)
.map_err(|(determinacy, _)| determinacy)
} }
#[tracing::instrument(level = "debug", skip(self))] #[tracing::instrument(level = "debug", skip(self))]
@ -759,7 +750,7 @@ impl<'a> Resolver<'a> {
ns: Namespace, ns: Namespace,
parent_scope: &ParentScope<'a>, parent_scope: &ParentScope<'a>,
finalize: Option<Finalize>, finalize: Option<Finalize>,
unusable_binding: Option<&'a NameBinding<'a>>, ignore_binding: Option<&'a NameBinding<'a>>,
) -> Result<&'a NameBinding<'a>, (Determinacy, Weak)> { ) -> Result<&'a NameBinding<'a>, (Determinacy, Weak)> {
let tmp_parent_scope; let tmp_parent_scope;
let mut adjusted_parent_scope = parent_scope; let mut adjusted_parent_scope = parent_scope;
@ -785,7 +776,7 @@ impl<'a> Resolver<'a> {
adjusted_parent_scope, adjusted_parent_scope,
false, false,
finalize, finalize,
unusable_binding, ignore_binding,
) )
} }
@ -797,7 +788,7 @@ impl<'a> Resolver<'a> {
ns: Namespace, ns: Namespace,
parent_scope: &ParentScope<'a>, parent_scope: &ParentScope<'a>,
finalize: Option<Finalize>, finalize: Option<Finalize>,
unusable_binding: Option<&'a NameBinding<'a>>, ignore_binding: Option<&'a NameBinding<'a>>,
) -> Result<&'a NameBinding<'a>, Determinacy> { ) -> Result<&'a NameBinding<'a>, Determinacy> {
self.resolve_ident_in_module_unadjusted_ext( self.resolve_ident_in_module_unadjusted_ext(
module, module,
@ -806,7 +797,7 @@ impl<'a> Resolver<'a> {
parent_scope, parent_scope,
false, false,
finalize, finalize,
unusable_binding, ignore_binding,
) )
.map_err(|(determinacy, _)| determinacy) .map_err(|(determinacy, _)| determinacy)
} }
@ -822,7 +813,9 @@ impl<'a> Resolver<'a> {
parent_scope: &ParentScope<'a>, parent_scope: &ParentScope<'a>,
restricted_shadowing: bool, restricted_shadowing: bool,
finalize: Option<Finalize>, finalize: Option<Finalize>,
unusable_binding: Option<&'a NameBinding<'a>>, // This binding should be ignored during in-module resolution, so that we don't get
// "self-confirming" import resolutions during import validation and checking.
ignore_binding: Option<&'a NameBinding<'a>>,
) -> Result<&'a NameBinding<'a>, (Determinacy, Weak)> { ) -> Result<&'a NameBinding<'a>, (Determinacy, Weak)> {
let module = match module { let module = match module {
ModuleOrUniformRoot::Module(module) => module, ModuleOrUniformRoot::Module(module) => module,
@ -834,7 +827,7 @@ impl<'a> Resolver<'a> {
parent_scope, parent_scope,
finalize, finalize,
finalize.is_some(), finalize.is_some(),
unusable_binding, ignore_binding,
); );
return binding.map_err(|determinacy| (determinacy, Weak::No)); return binding.map_err(|determinacy| (determinacy, Weak::No));
} }
@ -874,7 +867,7 @@ impl<'a> Resolver<'a> {
parent_scope, parent_scope,
finalize, finalize,
finalize.is_some(), finalize.is_some(),
unusable_binding, ignore_binding,
); );
return binding.map_err(|determinacy| (determinacy, Weak::No)); return binding.map_err(|determinacy| (determinacy, Weak::No));
} }
@ -891,12 +884,8 @@ impl<'a> Resolver<'a> {
// hack to avoid inconsistent resolution ICEs during import validation. // hack to avoid inconsistent resolution ICEs during import validation.
let binding = [resolution.binding, resolution.shadowed_glob] let binding = [resolution.binding, resolution.shadowed_glob]
.into_iter() .into_iter()
.filter_map(|binding| match (binding, unusable_binding) { .filter_map(|binding| match (binding, ignore_binding) {
(Some(binding), Some(unusable_binding)) (Some(binding), Some(ignored)) if ptr::eq(binding, ignored) => None,
if ptr::eq(binding, unusable_binding) =>
{
None
}
_ => binding, _ => binding,
}) })
.next(); .next();
@ -943,10 +932,8 @@ impl<'a> Resolver<'a> {
} }
let check_usable = |this: &mut Self, binding: &'a NameBinding<'a>| { let check_usable = |this: &mut Self, binding: &'a NameBinding<'a>| {
if let Some(unusable_binding) = unusable_binding { if let Some(ignored) = ignore_binding && ptr::eq(binding, ignored) {
if ptr::eq(binding, unusable_binding) { return Err((Determined, Weak::No));
return Err((Determined, Weak::No));
}
} }
let usable = this.is_accessible_from(binding.vis, parent_scope.module); let usable = this.is_accessible_from(binding.vis, parent_scope.module);
if usable { Ok(binding) } else { Err((Determined, Weak::No)) } if usable { Ok(binding) } else { Err((Determined, Weak::No)) }
@ -979,7 +966,7 @@ impl<'a> Resolver<'a> {
ns, ns,
&single_import.parent_scope, &single_import.parent_scope,
None, None,
unusable_binding, ignore_binding,
) { ) {
Err(Determined) => continue, Err(Determined) => continue,
Ok(binding) Ok(binding)
@ -1055,7 +1042,7 @@ impl<'a> Resolver<'a> {
ns, ns,
adjusted_parent_scope, adjusted_parent_scope,
None, None,
unusable_binding, ignore_binding,
); );
match result { match result {
@ -1362,9 +1349,9 @@ impl<'a> Resolver<'a> {
opt_ns: Option<Namespace>, // `None` indicates a module path in import opt_ns: Option<Namespace>, // `None` indicates a module path in import
parent_scope: &ParentScope<'a>, parent_scope: &ParentScope<'a>,
finalize: Option<Finalize>, finalize: Option<Finalize>,
unusable_binding: Option<&'a NameBinding<'a>>, ignore_binding: Option<&'a NameBinding<'a>>,
) -> PathResult<'a> { ) -> PathResult<'a> {
self.resolve_path_with_ribs(path, opt_ns, parent_scope, finalize, None, unusable_binding) self.resolve_path_with_ribs(path, opt_ns, parent_scope, finalize, None, ignore_binding)
} }
crate fn resolve_path_with_ribs( crate fn resolve_path_with_ribs(
@ -1374,7 +1361,7 @@ impl<'a> Resolver<'a> {
parent_scope: &ParentScope<'a>, parent_scope: &ParentScope<'a>,
finalize: Option<Finalize>, finalize: Option<Finalize>,
ribs: Option<&PerNS<Vec<Rib<'a>>>>, ribs: Option<&PerNS<Vec<Rib<'a>>>>,
unusable_binding: Option<&'a NameBinding<'a>>, ignore_binding: Option<&'a NameBinding<'a>>,
) -> PathResult<'a> { ) -> PathResult<'a> {
debug!("resolve_path(path={:?}, opt_ns={:?}, finalize={:?})", path, opt_ns, finalize); debug!("resolve_path(path={:?}, opt_ns={:?}, finalize={:?})", path, opt_ns, finalize);
@ -1477,7 +1464,7 @@ impl<'a> Resolver<'a> {
ns, ns,
parent_scope, parent_scope,
finalize, finalize,
unusable_binding, ignore_binding,
) )
} else if let Some(ribs) = ribs } else if let Some(ribs) = ribs
&& let Some(TypeNS | ValueNS) = opt_ns && let Some(TypeNS | ValueNS) = opt_ns
@ -1488,7 +1475,7 @@ impl<'a> Resolver<'a> {
parent_scope, parent_scope,
finalize, finalize,
&ribs[ns], &ribs[ns],
unusable_binding, ignore_binding,
) { ) {
// we found a locally-imported or available item/module // we found a locally-imported or available item/module
Some(LexicalScopeBinding::Item(binding)) => Ok(binding), Some(LexicalScopeBinding::Item(binding)) => Ok(binding),
@ -1504,7 +1491,7 @@ impl<'a> Resolver<'a> {
parent_scope, parent_scope,
finalize, finalize,
finalize.is_some(), finalize.is_some(),
unusable_binding, ignore_binding,
) )
}; };
FindBindingResult::Binding(binding) FindBindingResult::Binding(binding)
@ -1577,7 +1564,7 @@ impl<'a> Resolver<'a> {
opt_ns, opt_ns,
parent_scope, parent_scope,
ribs, ribs,
unusable_binding, ignore_binding,
module, module,
i, i,
ident, ident,

4
compiler/rustc_resolve/src/imports.rs
View File

@ -588,7 +588,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
/// consolidate multiple unresolved import errors into a single diagnostic. /// consolidate multiple unresolved import errors into a single diagnostic.
fn finalize_import(&mut self, import: &'b Import<'b>) -> Option<UnresolvedImportError> { fn finalize_import(&mut self, import: &'b Import<'b>) -> Option<UnresolvedImportError> {
let orig_vis = import.vis.replace(ty::Visibility::Invisible); let orig_vis = import.vis.replace(ty::Visibility::Invisible);
let unusable_binding = match &import.kind { let ignore_binding = match &import.kind {
ImportKind::Single { target_bindings, .. } => target_bindings[TypeNS].get(), ImportKind::Single { target_bindings, .. } => target_bindings[TypeNS].get(),
_ => None, _ => None,
}; };
@ -599,7 +599,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
None, None,
&import.parent_scope, &import.parent_scope,
Some(finalize), Some(finalize),
unusable_binding, ignore_binding,
); );
let no_ambiguity = self.r.ambiguity_errors.len() == prev_ambiguity_errors_len; let no_ambiguity = self.r.ambiguity_errors.len() == prev_ambiguity_errors_len;
import.vis.set(orig_vis); import.vis.set(orig_vis);

4
compiler/rustc_resolve/src/late.rs
View File

@ -969,7 +969,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
ident: Ident, ident: Ident,
ns: Namespace, ns: Namespace,
finalize: Option<Finalize>, finalize: Option<Finalize>,
unusable_binding: Option<&'a NameBinding<'a>>, ignore_binding: Option<&'a NameBinding<'a>>,
) -> Option<LexicalScopeBinding<'a>> { ) -> Option<LexicalScopeBinding<'a>> {
self.r.resolve_ident_in_lexical_scope( self.r.resolve_ident_in_lexical_scope(
ident, ident,
@ -977,7 +977,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
&self.parent_scope, &self.parent_scope,
finalize, finalize,
&self.ribs[ns], &self.ribs[ns],
unusable_binding, ignore_binding,
) )
} }