Get queries sort of compiling

Author: Aaron1011

compiler/rustc_data_structures/src/stable_hasher.rs

@@ -311,6 +311,14 @@ impl<T1: HashStableEq, T2: HashStableEq> HashStableEq for (T1, T2) {
     }
 }
 
+impl<T1: HashStableEq, T2: HashStableEq, T3: HashStableEq> HashStableEq for (T1, T2, T3) {
+    fn hash_stable_eq(&self, other: &Self) -> bool {
+        self.0.hash_stable_eq(&other.0) && self.1.hash_stable_eq(&other.1)
+            && self.2.hash_stable_eq(&other.2)
+    }
+}
+
+
 impl<T1: HashStable<CTX>, CTX> HashStable<CTX> for (T1,) {
     fn hash_stable(&self, ctx: &mut CTX, hasher: &mut StableHasher) {
         let (ref _0,) = *self;

compiler/rustc_middle/src/ty/list.rs

@@ -1,5 +1,6 @@
 use crate::arena::Arena;
 use rustc_serialize::{Encodable, Encoder};
+use rustc_data_structures::stable_hasher::HashStableEq;
 use std::alloc::Layout;
 use std::cmp::Ordering;
 use std::fmt;
@@ -134,6 +135,13 @@ impl<T: PartialEq> PartialEq for List<T> {
     }
 }
 
+impl<T: HashStableEq> HashStableEq for List<T> {
+    fn hash_stable_eq(&self, other: &Self) -> bool {
+        // FIXME - is this right?
+        self == other
+    }
+}
+
 impl<T: Eq> Eq for List<T> {}
 
 impl<T> Ord for List<T>

compiler/rustc_middle/src/ty/mod.rs

@@ -513,6 +513,12 @@ static_assert_size!(PredicateS<'_>, 56);
 #[cfg_attr(not(bootstrap), rustc_pass_by_value)]
 pub struct Predicate<'tcx>(Interned<'tcx, PredicateS<'tcx>>);
 
+impl<'tcx> HashStableEq for Predicate<'tcx> {
+    fn hash_stable_eq(&self, other: &Self) -> bool {
+        self == other
+    }
+}
+
 impl<'tcx> Predicate<'tcx> {
     /// Gets the inner `Binder<'tcx, PredicateKind<'tcx>>`.
     #[inline]
@@ -1289,7 +1295,7 @@ impl WithOptConstParam<DefId> {
 /// When type checking, we use the `ParamEnv` to track
 /// details about the set of where-clauses that are in scope at this
 /// particular point.
-#[derive(Copy, Clone, Hash, PartialEq, Eq)]
+#[derive(Copy, Clone, Hash, PartialEq, Eq, HashStableEq)]
 pub struct ParamEnv<'tcx> {
     /// This packs both caller bounds and the reveal enum into one pointer.
     ///
@@ -1524,7 +1530,7 @@ impl<'tcx> PolyTraitRef<'tcx> {
     }
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, TypeFoldable)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, TypeFoldable, HashStableEq)]
 pub struct ParamEnvAnd<'tcx, T> {
     pub param_env: ParamEnv<'tcx>,
     pub value: T,

compiler/rustc_middle/src/ty/sty.rs

@@ -1074,7 +1074,7 @@ pub enum BoundVariableKind {
 /// e.g., `liberate_late_bound_regions`).
 ///
 /// `Decodable` and `Encodable` are implemented for `Binder<T>` using the `impl_binder_encode_decode!` macro.
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, HashStableEq)]
 pub struct Binder<'tcx, T>(T, &'tcx List<BoundVariableKind>);
 
 impl<'tcx, T> Binder<'tcx, T>

compiler/rustc_middle/src/ty/subst.rs

@@ -8,7 +8,7 @@ use crate::ty::{self, Lift, List, ParamConst, Ty, TyCtxt};
 
 use rustc_data_structures::intern::Interned;
 use rustc_hir::def_id::DefId;
-use rustc_macros::HashStable;
+use rustc_macros::{HashStable, HashStableEq};
 use rustc_serialize::{self, Decodable, Encodable};
 use rustc_span::{Span, DUMMY_SP};
 use smallvec::SmallVec;
@@ -29,7 +29,7 @@ use std::ops::ControlFlow;
 ///
 /// Note: the `PartialEq`, `Eq` and `Hash` derives are only valid because `Ty`,
 /// `Region` and `Const` are all interned.
-#[derive(Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Copy, Clone, PartialEq, Eq, Hash, HashStableEq)]
 pub struct GenericArg<'tcx> {
     ptr: NonZeroUsize,
     marker: PhantomData<(Ty<'tcx>, ty::Region<'tcx>, ty::Const<'tcx>)>,