Handle rustc_query_system cases of rustc::potential_query_instability lint

Author: ismailarilik

compiler/rustc_data_structures/src/fx.rs

@@ -1,5 +1,6 @@
 use std::hash::BuildHasherDefault;
 
+pub use indexmap::map::RawEntryApiV1 as IndexRawEntryApiV1;
 pub use rustc_hash::{FxHashMap, FxHashSet, FxHasher};
 
 pub type StdEntry<'a, K, V> = std::collections::hash_map::Entry<'a, K, V>;

compiler/rustc_query_system/src/dep_graph/graph.rs

@@ -1,4 +1,5 @@
 use std::assert_matches::assert_matches;
+use std::collections::hash_map::Entry;
 use std::fmt::Debug;
 use std::hash::Hash;
 use std::marker::PhantomData;

compiler/rustc_query_system/src/dep_graph/serialized.rs

@@ -719,6 +719,8 @@ impl<D: Deps> GraphEncoder<D> {
         let mut status = self.status.lock();
         let status = status.as_mut().unwrap();
         if let Some(record_stats) = &status.stats {
+            // `stats` is sorted below so we can allow this lint here.
+            #[allow(rustc::potential_query_instability)]
             let mut stats: Vec<_> = record_stats.values().collect();
             stats.sort_by_key(|s| -(s.node_counter as i64));
 

compiler/rustc_query_system/src/lib.rs

@@ -1,5 +1,5 @@
 // tidy-alphabetical-start
-#![allow(rustc::potential_query_instability, internal_features)]
+#![allow(internal_features)]
 #![cfg_attr(bootstrap, feature(let_chains))]
 #![feature(assert_matches)]
 #![feature(core_intrinsics)]

compiler/rustc_query_system/src/query/job.rs

@@ -6,7 +6,7 @@ use std::num::NonZero;
 use std::sync::Arc;
 
 use parking_lot::{Condvar, Mutex};
-use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_data_structures::fx::{FxHashSet, FxIndexMap};
 use rustc_errors::{Diag, DiagCtxtHandle};
 use rustc_hir::def::DefKind;
 use rustc_session::Session;
@@ -35,7 +35,7 @@ impl<I> QueryInfo<I> {
     }
 }
 
-pub type QueryMap<I> = FxHashMap<QueryJobId, QueryJobInfo<I>>;
+pub type QueryMap<I> = FxIndexMap<QueryJobId, QueryJobInfo<I>>;
 
 /// A value uniquely identifying an active query job.
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]