Make the logic more explicit with let chains.

Author: cjgillot

compiler/rustc_resolve/src/ident.rs

@@ -1472,36 +1472,34 @@ impl<'a> Resolver<'a> {
                         false,
                         unusable_binding,
                     )
-                } else if ribs.is_none() || opt_ns.is_none() || opt_ns == Some(MacroNS) {
-                    let scopes = ScopeSet::All(ns, opt_ns.is_none());
-                    this.early_resolve_ident_in_lexical_scope(
-                        ident,
-                        scopes,
-                        parent_scope,
-                        finalize,
-                        finalize.is_some(),
-                        false,
-                        unusable_binding,
-                    )
-                } else {
+                } 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.unwrap()[ns],
+                        &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))
-                            if opt_ns == Some(TypeNS) || opt_ns == Some(ValueNS) =>
-                        {
-                            return FindBindingResult::Res(res);
-                        }
+                        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,
+                        scopes,
+                        parent_scope,
+                        finalize,
+                        finalize.is_some(),
+                        false,
+                        unusable_binding,
+                    )
                 };
                 FindBindingResult::Binding(binding)
             };