nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the logic more explicit with let chains.

Browse Source
This commit is contained in:
Camille GILLOT 2022-04-08 22:51:44 +02:00
parent 3ee6f6e28a
commit 886613c916
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1472,7 +1472,24 @@ impl<'a> Resolver<'a> {
false,
unusable_binding,
)
} else if ribs.is_none() || opt_ns.is_none() || opt_ns == Some(MacroNS) {
} else if let Some(ribs) = ribs
&& let Some(TypeNS | ValueNS) = opt_ns
{
match this.resolve_ident_in_lexical_scope(
ident,
ns,
parent_scope,
finalize_full,
&ribs[ns],
unusable_binding,
) {
// we found a locally-imported or available item/module
Some(LexicalScopeBinding::Item(binding)) => Ok(binding),
// we found a local variable or type param
Some(LexicalScopeBinding::Res(res)) => return FindBindingResult::Res(res),
_ => Err(Determinacy::determined(finalize.is_some())),
}
} else {
let scopes = ScopeSet::All(ns, opt_ns.is_none());
this.early_resolve_ident_in_lexical_scope(
ident,
@ -1483,25 +1500,6 @@ impl<'a> Resolver<'a> {
false,
unusable_binding,
)
} else {
match this.resolve_ident_in_lexical_scope(
ident,
ns,
parent_scope,
finalize_full,
&ribs.unwrap()[ns],
unusable_binding,
) {
// we found a locally-imported or available item/module
Some(LexicalScopeBinding::Item(binding)) => Ok(binding),
// we found a local variable or type param
Some(LexicalScopeBinding::Res(res))
if opt_ns == Some(TypeNS) || opt_ns == Some(ValueNS) =>
{
return FindBindingResult::Res(res);
}
_ => Err(Determinacy::determined(finalize.is_some())),
}
};
FindBindingResult::Binding(binding)
};