fix rebase conflicts

Author: chenyukang

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -1,7 +1,6 @@
 use rustc_arena::TypedArena;
 use rustc_ast::CRATE_NODE_ID;
-use rustc_data_structures::fx::FxIndexMap;
-use rustc_data_structures::fx::FxIndexSet;
+use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
 use rustc_data_structures::memmap::Mmap;
 use rustc_data_structures::temp_dir::MaybeTempDir;
 use rustc_errors::{DiagCtxt, ErrorGuaranteed};

compiler/rustc_codegen_ssa/src/base.rs

@@ -912,8 +912,6 @@ impl CrateInfo {
                 .collect();
             let prefix = if target.is_like_windows && target.arch == "x86" { "_" } else { "" };
 
-            // This loop only adds new items to values of the hash map, so the order in which we
-            // iterate over the values is not important.
             info.linked_symbols
                 .iter_mut()
                 .filter(|(crate_type, _)| {

compiler/rustc_hir_analysis/src/collect.rs

@@ -835,12 +835,12 @@ impl From<NestedSpan> for FieldDeclSpan {
 
 struct FieldUniquenessCheckContext<'tcx> {
     tcx: TyCtxt<'tcx>,
-    seen_fields: FxHashMap<Ident, FieldDeclSpan>,
+    seen_fields: FxIndexMap<Ident, FieldDeclSpan>,
 }
 
 impl<'tcx> FieldUniquenessCheckContext<'tcx> {
     fn new(tcx: TyCtxt<'tcx>) -> Self {
-        Self { tcx, seen_fields: FxHashMap::default() }
+        Self { tcx, seen_fields: FxIndexMap::default() }
     }
 
     /// Check if a given field `ident` declared at `field_decl` has been declared elsewhere before.

compiler/rustc_lint/src/context.rs

@@ -373,7 +373,7 @@ impl LintStore {
                     None => {
                         // 1. The tool is currently running, so this lint really doesn't exist.
                         // FIXME: should this handle tools that never register a lint, like rustfmt?
-                        debug!("lints={:?}", self.by_name.keys().into_sorted_stable_ord());
+                        debug!("lints={:?}", self.by_name);
                         let tool_prefix = format!("{tool_name}::");
 
                         return if self.by_name.keys().any(|lint| lint.starts_with(&tool_prefix)) {