fix rebase conflicts

chenyukang · chenyukang · commit 90b505e602ec · 2024-02-13T05:47:25.000+08:00
diff --git a/compiler/rustc_hir_analysis/src/collect.rs b/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.

Original file line number	Diff line number	Diff line change
`@@ -835,12 +835,12 @@ impl From<NestedSpan> for FieldDeclSpan {`
`835`	`835`
`836`	`836`	`struct FieldUniquenessCheckContext<'tcx> {`
`837`	`837`	`tcx: TyCtxt<'tcx>,`
`838`		`- seen_fields: FxHashMap<Ident, FieldDeclSpan>,`
	`838`	`+ seen_fields: FxIndexMap<Ident, FieldDeclSpan>,`
`839`	`839`	`}`
`840`	`840`
`841`	`841`	`impl<'tcx> FieldUniquenessCheckContext<'tcx> {`
`842`	`842`	`fn new(tcx: TyCtxt<'tcx>) -> Self {`
`843`		`- Self { tcx, seen_fields: FxHashMap::default() }`
	`843`	`+ Self { tcx, seen_fields: FxIndexMap::default() }`
`844`	`844`	`}`
`845`	`845`
`846`	`846`	/// Check if a given field `ident` declared at `field_decl` has been declared elsewhere before.