catch both Pending and Ready(None)

Author: LorrensP-2158466

compiler/rustc_resolve/src/ident.rs

@@ -13,7 +13,7 @@ use rustc_span::{Ident, Span, kw, sym};
 use tracing::{debug, instrument};
 
 use crate::errors::{ParamKindInEnumDiscriminant, ParamKindInNonTrivialAnonConst};
-use crate::imports::Import;
+use crate::imports::{Import, Progress};
 use crate::late::{ConstantHasGenerics, NoConstantGenericsReason, PathSource, Rib, RibKind};
 use crate::macros::{MacroRulesScope, sub_namespace_match};
 use crate::{
@@ -983,12 +983,16 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             if source != target {
                 // This branch allows the binding to be defined or updated later if the target name
                 // can hide the source.
-                if bindings.iter().all(|binding| binding.get().is_pending()) {
+                if bindings.iter().all(|binding| {
+                    matches!(binding.get(), Progress::Pending | Progress::Ready(None))
+                }) {
                     // None of the target bindings are available, so we can't determine
                     // if this binding is correct or not.
                     // See more details in #124840
                     return Err((Undetermined, Weak::No));
-                } else if bindings[ns].get().is_pending() && binding.is_some() {
+                } else if matches!(bindings[ns].get(), Progress::Pending | Progress::Ready(None))
+                    && binding.is_some()
+                {
                     // `binding.is_some()` avoids the condition where the binding
                     // truly doesn't exist in this namespace and should return `Err(Determined)`.
                     return Err((Undetermined, Weak::No));

compiler/rustc_resolve/src/imports.rs

@@ -42,7 +42,7 @@ use crate::{
 type Res = def::Res<NodeId>;
 
 // Poll is a weird name.
-use std::task::Poll as Progress;
+pub(crate) use std::task::Poll as Progress;
 
 /// Contains data for specific kinds of imports.
 #[derive(Clone)]
@@ -490,7 +490,11 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
     // or indeterminate resolution, also mark such failed imports as used to avoid duplicate diagnostics.
     fn import_dummy_binding(&mut self, import: Import<'ra>, is_indeterminate: bool) {
         if let ImportKind::Single { target, ref bindings, .. } = import.kind {
-            if !(is_indeterminate || bindings.iter().all(|binding| binding.get().is_pending())) {
+            if !(is_indeterminate
+                || bindings.iter().all(|binding| {
+                    matches!(binding.get(), Progress::Pending | Progress::Ready(None))
+                }))
+            {
                 return; // Has resolution, do not create the dummy binding
             }
             let dummy_binding = self.dummy_binding;