[PERF-TEST] Remove Encodable from HashMap, HashSet, UnordMap and UnordSet

compiler/rustc_ast/src/format.rs

@@ -1,4 +1,4 @@
-use rustc_data_structures::fx::FxHashMap;
+use rustc_data_structures::fx::FxIndexMap;
 use rustc_macros::{Decodable, Encodable, Walkable};
 use rustc_span::{Ident, Span, Symbol};
 
@@ -78,14 +78,14 @@ pub struct FormatArguments {
     arguments: Vec<FormatArgument>,
     num_unnamed_args: usize,
     num_explicit_args: usize,
-    names: FxHashMap<Symbol, usize>,
+    names: FxIndexMap<Symbol, usize>,
 }
 
 impl FormatArguments {
     pub fn new() -> Self {
         Self {
             arguments: Vec::new(),
-            names: FxHashMap::default(),
+            names: FxIndexMap::default(),
             num_unnamed_args: 0,
             num_explicit_args: 0,
         }

compiler/rustc_ast/src/visit.rs

@@ -446,7 +446,7 @@ macro_rules! common_visitor_and_walkers {
             crate::token::LitKind,
             crate::tokenstream::LazyAttrTokenStream,
             crate::tokenstream::TokenStream,
-            rustc_data_structures::fx::FxHashMap<Symbol, usize>,
+            rustc_data_structures::fx::FxIndexMap<Symbol, usize>,
             rustc_span::ByteSymbol,
             rustc_span::ErrorGuaranteed,
             std::borrow::Cow<'_, str>,

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -976,11 +976,8 @@ fn link_dwarf_object(
         }
 
         // Input rlibs contain .o/.dwo files from dependencies.
-        let input_rlibs = crate_info
-            .used_crate_source
-            .items()
-            .filter_map(|(_, csource)| csource.rlib.as_ref())
-            .into_sorted_stable_ord();
+        let input_rlibs =
+            crate_info.used_crate_source.iter().filter_map(|(_, csource)| csource.rlib.as_ref());
 
         for input_rlib in input_rlibs {
             debug!(?input_rlib);

compiler/rustc_codegen_ssa/src/back/symbol_export.rs

@@ -1,11 +1,9 @@
-use std::collections::hash_map::Entry::*;
-
 use object::pe;
 use rustc_abi::{CanonAbi, X86Call};
 use rustc_ast::expand::allocator::{AllocatorKind, NO_ALLOC_SHIM_IS_UNSTABLE, global_fn_name};
 use rustc_crate_store::CrateDepKind;
-use rustc_data_structures::fx::FxHashSet;
-use rustc_data_structures::unord::UnordMap;
+use rustc_data_structures::fx::{FxHashSet, FxIndexMap};
+use rustc_data_structures::indexmap::map::Entry::*;
 use rustc_hir as hir;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LOCAL_CRATE, LocalDefId};
@@ -66,7 +64,7 @@ pub fn reachable_non_generics_helper(tcx: TyCtxt<'_>) -> DefIdMap<SymbolExportIn
 
     let mut reachable_non_generics: DefIdMap<_> = tcx
         .reachable_set(())
-        .items()
+        .iter()
         .filter_map(|&def_id| {
             // We want to ignore some FFI functions that are not exposed from
             // this crate. Reachable FFI functions can be lumped into two
@@ -150,7 +148,7 @@ pub fn reachable_non_generics_helper(tcx: TyCtxt<'_>) -> DefIdMap<SymbolExportIn
             };
             (def_id.to_def_id(), info)
         })
-        .into();
+        .collect();
 
     if let Some(id) = tcx.proc_macro_decls_static(()) {
         reachable_non_generics.insert(
@@ -495,10 +493,10 @@ fn exported_generic_symbols_provider_local<'tcx>(
 fn upstream_monomorphizations_provider(
     tcx: TyCtxt<'_>,
     (): (),
-) -> DefIdMap<UnordMap<GenericArgsRef<'_>, CrateNum>> {
+) -> DefIdMap<FxIndexMap<GenericArgsRef<'_>, CrateNum>> {
     let cnums = tcx.crates(());
 
-    let mut instances: DefIdMap<UnordMap<_, _>> = Default::default();
+    let mut instances: DefIdMap<FxIndexMap<_, _>> = Default::default();
 
     let drop_glue_fn_def_id = tcx.lang_items().drop_glue_fn();
     let async_drop_in_place_fn_def_id = tcx.lang_items().async_drop_in_place_fn();
@@ -560,7 +558,7 @@ fn upstream_monomorphizations_provider(
 fn upstream_monomorphizations_for_provider(
     tcx: TyCtxt<'_>,
     def_id: DefId,
-) -> Option<&UnordMap<GenericArgsRef<'_>, CrateNum>> {
+) -> Option<&FxIndexMap<GenericArgsRef<'_>, CrateNum>> {
     assert!(!def_id.is_local());
     tcx.upstream_monomorphizations(()).get(&def_id)
 }

compiler/rustc_codegen_ssa/src/base.rs

@@ -15,7 +15,6 @@ use rustc_attr_ir::{DebuggerVisualizerType, EiiDecl, EiiImpl, OptimizeAttr, find
 use rustc_data_structures::fx::{FxHashMap, FxIndexMap, FxIndexSet};
 use rustc_data_structures::profiling::{get_resident_set_size, print_time_passes_entry};
 use rustc_data_structures::sync::{IntoDynSyncSend, par_map};
-use rustc_data_structures::unord::UnordMap;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrs;
@@ -1073,9 +1072,9 @@ impl CrateInfo {
             is_no_builtins: Default::default(),
             native_libraries: Default::default(),
             used_libraries: tcx.native_libraries(LOCAL_CRATE).iter().map(Into::into).collect(),
-            crate_name: UnordMap::with_capacity(n_crates),
+            crate_name: FxIndexMap::with_capacity_and_hasher(n_crates, Default::default()),
             used_crates,
-            used_crate_source: UnordMap::with_capacity(n_crates),
+            used_crate_source: FxIndexMap::with_capacity_and_hasher(n_crates, Default::default()),
             dependency_formats,
             eii_linkage,
             windows_subsystem,

compiler/rustc_codegen_ssa/src/lib.rs

@@ -20,8 +20,8 @@ use std::sync::Arc;
 use rustc_abi::Size;
 use rustc_attr_ir::{CfgEntry, WindowsSubsystemKind};
 use rustc_crate_store::{self as cstore, CrateSource};
-use rustc_data_structures::fx::{FxHashSet, FxIndexMap};
-use rustc_data_structures::unord::{UnordMap, UnordSet};
+use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
+use rustc_data_structures::unord::UnordSet;
 use rustc_hir::CRATE_HIR_ID;
 use rustc_hir::def_id::CrateNum;
 use rustc_lint_defs::builtin::{LINKER_INFO, LINKER_MESSAGES};
@@ -267,16 +267,16 @@ pub struct CrateInfo {
     pub target_cpu: String,
     pub target_features: Vec<String>,
     pub crate_types: Vec<CrateType>,
-    pub exported_symbols: UnordMap<CrateType, Vec<SymbolExport>>,
+    pub exported_symbols: FxIndexMap<CrateType, Vec<SymbolExport>>,
     pub linked_symbols: FxIndexMap<CrateType, Vec<(String, SymbolExportKind)>>,
     pub local_crate_name: Symbol,
     pub compiler_builtins: Option<CrateNum>,
     pub profiler_runtime: Option<CrateNum>,
-    pub is_no_builtins: FxHashSet<CrateNum>,
+    pub is_no_builtins: FxIndexSet<CrateNum>,
     pub native_libraries: FxIndexMap<CrateNum, Vec<NativeLib>>,
-    pub crate_name: UnordMap<CrateNum, Symbol>,
+    pub crate_name: FxIndexMap<CrateNum, Symbol>,
     pub used_libraries: Vec<NativeLib>,
-    pub used_crate_source: UnordMap<CrateNum, Arc<CrateSource>>,
+    pub used_crate_source: FxIndexMap<CrateNum, Arc<CrateSource>>,
     pub used_crates: Vec<CrateNum>,
     pub dependency_formats: Arc<Dependencies>,
     /// EII implementations used by the link-time duplicate check, so `-Zno-link` can serialize the data needed by a

compiler/rustc_data_structures/src/fx.rs

@@ -16,6 +16,13 @@ macro_rules! define_id_collections {
         pub type $set_name = $crate::unord::UnordSet<$key>;
         pub type $entry_name<'a, T> = $crate::fx::StdEntry<'a, $key, T>;
     };
+    ($map_name:ident, $set_name:ident, $entry_name:ident, $key:ty, $index_map_name:ident, $index_set_name:ident) => {
+        pub type $map_name<T> = $crate::unord::UnordMap<$key, T>;
+        pub type $set_name = $crate::unord::UnordSet<$key>;
+        pub type $entry_name<'a, T> = $crate::fx::StdEntry<'a, $key, T>;
+        pub type $index_map_name<T> = $crate::fx::FxIndexMap<$key, T>;
+        pub type $index_set_name = $crate::fx::FxIndexSet<$key>;
+    };
 }
 
 #[macro_export]

compiler/rustc_data_structures/src/unord.rs

@@ -449,7 +449,7 @@ impl<V: Hash + Eq + StableHash> StableHash for UnordSet<V> {
 ///
 /// See [MCP 533](https://github.com/rust-lang/compiler-team/issues/533)
 /// for more information.
-#[derive(Debug, Eq, PartialEq, Clone, Encodable_NoContext, Decodable_NoContext)]
+#[derive(Debug, Eq, PartialEq, Clone)]
 pub struct UnordMap<K: Eq + Hash, V> {
     inner: FxHashMap<K, V>,
 }

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

@@ -3,7 +3,7 @@ use std::borrow::Cow;
 use std::cmp::Ordering;
 use std::iter;
 
-use hir::def_id::{DefId, DefIdMap, LocalDefId};
+use hir::def_id::{DefId, LocalDefId};
 use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
 use rustc_errors::codes::*;
 use rustc_errors::{Applicability, ErrorGuaranteed, MultiSpan, pluralize, struct_span_code_err};
@@ -458,7 +458,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for RemapLateParam<'tcx> {
 pub(super) fn collect_return_position_impl_trait_in_trait_tys<'tcx>(
     tcx: TyCtxt<'tcx>,
     impl_m_def_id: LocalDefId,
-) -> Result<&'tcx DefIdMap<ty::EarlyBinder<'tcx, Ty<'tcx>>>, ErrorGuaranteed> {
+) -> Result<&'tcx FxIndexMap<DefId, ty::EarlyBinder<'tcx, Ty<'tcx>>>, ErrorGuaranteed> {
     let impl_m = tcx.associated_item(impl_m_def_id.to_def_id());
     let trait_m = tcx.associated_item(impl_m.expect_trait_impl()?);
     let impl_trait_ref = tcx
@@ -706,7 +706,7 @@ pub(super) fn collect_return_position_impl_trait_in_trait_tys<'tcx>(
     // lifetime parameters.
     ocx.resolve_regions_and_report_errors(impl_m_def_id, param_env, wf_tys)?;
 
-    let mut remapped_types = DefIdMap::default();
+    let mut remapped_types = FxIndexMap::default();
     for (def_id, (ty, args)) in collected_types {
         match infcx.deeply_resolve_via_region_graph(ty) {
             Ok(ty) => {

compiler/rustc_hir_analysis/src/check/compare_impl_item/refine.rs

@@ -67,7 +67,7 @@ pub(crate) fn check_refining_return_position_impl_trait_in_trait<'tcx>(
         return;
     };
 
-    if hidden_tys.items().any(|(_, &ty)| ty.skip_binder().references_error()) {
+    if hidden_tys.iter().any(|(_, &ty)| ty.skip_binder().references_error()) {
         return;
     }
 

compiler/rustc_hir_analysis/src/check_unused.rs

@@ -1,4 +1,4 @@
-use rustc_data_structures::unord::{ExtendUnord, UnordSet};
+use rustc_data_structures::unord::UnordSet;
 use rustc_errors::{Diag, DiagCtxtHandle, Diagnostic, Level};
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::LocalDefId;
@@ -33,7 +33,7 @@ pub(super) fn check_unused_traits(tcx: TyCtxt<'_>, (): ()) {
     for item_def_id in tcx.hir_body_owners() {
         let imports = tcx.used_trait_imports(item_def_id);
         debug!("GatherVisitor: item_def_id={:?} with imports {:#?}", item_def_id, imports);
-        used_trait_imports.extend_unord(imports.items().copied());
+        used_trait_imports.extend(imports.iter().copied());
     }
 
     for &id in tcx.resolutions(()).maybe_unused_trait_imports.iter() {

compiler/rustc_hir_id/src/lib.rs

@@ -154,7 +154,7 @@ impl From<LocalModId> for HirId {
 }
 
 rustc_data_structures::define_stable_id_collections!(HirIdMap, HirIdSet, HirIdMapEntry, HirId);
-rustc_data_structures::define_id_collections!(
+rustc_data_structures::define_stable_id_collections!(
     ItemLocalMap,
     ItemLocalSet,
     ItemLocalMapEntry,

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

@@ -1,9 +1,9 @@
-use std::collections::hash_map::Entry;
 use std::slice;
 
 use rustc_abi::FieldIdx;
 use rustc_attr_ir::lang_items::LangItem;
 use rustc_data_structures::fx::FxHashSet;
+use rustc_data_structures::indexmap::map::Entry;
 use rustc_data_structures::thin_vec::ThinVec;
 use rustc_errors::{
     Applicability, Diag, DiagCtxtHandle, Diagnostic, ErrorGuaranteed, Level, MultiSpan,

compiler/rustc_hir_typeck/src/lib.rs

@@ -39,7 +39,7 @@ mod writeback;
 
 pub use coercion::can_coerce;
 use fn_ctxt::FnCtxt;
-use rustc_data_structures::unord::UnordSet;
+use rustc_data_structures::fx::FxIndexSet;
 use rustc_errors::codes::*;
 use rustc_errors::{Applicability, Diag, ErrorGuaranteed, struct_span_code_err};
 use rustc_hir as hir;
@@ -77,7 +77,7 @@ macro_rules! type_error_struct {
     })
 }
 
-fn used_trait_imports(tcx: TyCtxt<'_>, def_id: LocalDefId) -> &UnordSet<LocalDefId> {
+fn used_trait_imports(tcx: TyCtxt<'_>, def_id: LocalDefId) -> &FxIndexSet<LocalDefId> {
     &tcx.typeck(def_id).used_trait_imports
 }
 

compiler/rustc_hir_typeck/src/upvar.rs

@@ -889,7 +889,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         let mut typeck_results = self.typeck_results.borrow_mut();
 
         let mut root_var_min_capture_list =
-            typeck_results.closure_min_captures.remove(&closure_def_id).unwrap_or_default();
+            typeck_results.closure_min_captures.swap_remove(&closure_def_id).unwrap_or_default();
 
         for (mut place, capture_info) in capture_information.into_iter() {
             let var_hir_id = match place.base {