revert change in finalize_resolutions_in + other small things

Author: LorrensP-2158466

compiler/rustc_resolve/src/imports.rs

@@ -342,8 +342,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             && (vis == import_vis
                 || max_vis.get().is_none_or(|max_vis| vis.is_at_least(max_vis, self.tcx)))
         {
-            // FIXME(batched): Will be fixed in batched import resolution.
-            max_vis.set_unchecked(Some(vis.expect_local()))
+            max_vis.set(Some(vis.expect_local()), self)
         }
 
         self.arenas.alloc_name_binding(NameBindingData {
@@ -979,8 +978,9 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         import: Import<'ra>,
     ) -> (Option<SideEffect<'ra>>, usize) {
         debug!(
-            "(resolving import for module) resolving import `{}::...` in `{}`",
+            "(resolving import for module) resolving import `{}::{}` in `{}`",
             Segment::names_to_string(&import.module_path),
+            import_kind_to_string(&import.kind),
             module_to_string(import.parent_scope.module).unwrap_or_else(|| "???".to_string()),
         );
         let module = if let Some(module) = import.imported_module.get() {
@@ -1047,7 +1047,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                         None
                     }
                 };
-                // FIXME(batched): Will be fixed in batched import resolution.
                 import_bindings[ns] = pending_binding;
             }
         }
@@ -1648,7 +1647,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 
         module.for_each_child(self, |this, ident, _, binding| {
             let res = binding.res().expect_non_local();
-            if res != def::Res::Err && !binding.is_ambiguity_recursive() {
+            let error_ambiguity = binding.is_ambiguity_recursive() && !binding.warn_ambiguity;
+            if res != def::Res::Err && !error_ambiguity {
                 let mut reexport_chain = SmallVec::new();
                 let mut next_binding = binding;
                 while let NameBindingKind::Import { binding, import, .. } = next_binding.kind {

compiler/rustc_resolve/src/lib.rs

@@ -2596,6 +2596,13 @@ mod ref_mut {
             CmCell(Cell::new(value))
         }
 
+        pub(crate) fn set<'ra, 'tcx>(&self, val: T, r: &Resolver<'ra, 'tcx>) {
+            if r.assert_speculative {
+                panic!()
+            }
+            self.0.set(val);
+        }
+
         pub(crate) fn set_unchecked(&self, val: T) {
             self.0.set(val);
         }