merge source and target bindings into single field

Author: LorrensP-2158466

compiler/rustc_resolve/src/build_reduced_graph.rs

@@ -7,6 +7,7 @@
 
 use std::cell::Cell;
 use std::sync::Arc;
+use std::task::Poll;
 
 use rustc_ast::visit::{self, AssocCtxt, Visitor, WalkItemKind};
 use rustc_ast::{
@@ -32,10 +33,9 @@ use crate::def_collector::collect_definitions;
 use crate::imports::{ImportData, ImportKind};
 use crate::macros::{MacroRulesBinding, MacroRulesScope, MacroRulesScopeRef};
 use crate::{
-    BindingKey, Determinacy, ExternPreludeEntry, Finalize, MacroData, Module, ModuleKind,
-    ModuleOrUniformRoot, NameBinding, NameBindingData, NameBindingKind, ParentScope, PathResult,
-    ResolutionError, Resolver, ResolverArenas, Segment, ToNameBinding, Used, VisResolutionError,
-    errors,
+    BindingKey, ExternPreludeEntry, Finalize, MacroData, Module, ModuleKind, ModuleOrUniformRoot,
+    NameBinding, NameBindingData, NameBindingKind, ParentScope, PathResult, ResolutionError,
+    Resolver, ResolverArenas, Segment, ToNameBinding, Used, VisResolutionError, errors,
 };
 
 type Res = def::Res<NodeId>;
@@ -620,19 +620,24 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
                 let kind = ImportKind::Single {
                     source: source.ident,
                     target: ident,
-                    source_bindings: PerNS {
-                        type_ns: Cell::new(Err(Determinacy::Undetermined)),
-                        value_ns: Cell::new(Err(Determinacy::Undetermined)),
-                        macro_ns: Cell::new(Err(Determinacy::Undetermined)),
-                    },
-                    target_bindings: PerNS {
-                        type_ns: Cell::new(None),
-                        value_ns: Cell::new(None),
-                        macro_ns: Cell::new(None),
-                    },
+                    // source_bindings: PerNS {
+                    //     type_ns: Cell::new(Err(Determinacy::Undetermined)),
+                    //     value_ns: Cell::new(Err(Determinacy::Undetermined)),
+                    //     macro_ns: Cell::new(Err(Determinacy::Undetermined)),
+                    // },
+                    // target_bindings: PerNS {
+                    //     type_ns: Cell::new(None),
+                    //     value_ns: Cell::new(None),
+                    //     macro_ns: Cell::new(None),
+                    // },
                     type_ns_only,
                     nested,
                     id,
+                    bindings: PerNS {
+                        value_ns: Cell::new(Poll::Pending),
+                        type_ns: Cell::new(Poll::Pending),
+                        macro_ns: Cell::new(Poll::Pending),
+                    },
                 };
 
                 self.add_import(module_path, kind, use_tree.span, item, root_span, item.id, vis);

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, NameResolution};
+use crate::imports::{Import, NameResolution, Progress};
 use crate::late::{ConstantHasGenerics, NoConstantGenericsReason, PathSource, Rib, RibKind};
 use crate::macros::{MacroRulesScope, sub_namespace_match};
 use crate::{
@@ -1090,14 +1090,17 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             let Some(module) = single_import.imported_module.get() else {
                 return true;
             };
-            let ImportKind::Single { source, target, target_bindings, .. } = &single_import.kind
-            else {
+            let ImportKind::Single { source, target, bindings, .. } = &single_import.kind else {
                 unreachable!();
             };
             if source != target {
-                if target_bindings.iter().all(|binding| binding.get().is_none()) {
+                if bindings.iter().all(|binding| {
+                    matches!(binding.get(), Progress::Ready(None) | Progress::Pending)
+                }) {
                     return true;
-                } else if target_bindings[ns].get().is_none() && binding.is_some() {
+                } else if matches!(bindings[ns].get(), Progress::Ready(None) | Progress::Pending)
+                    && binding.is_some()
+                {
                     return true;
                 }
             }