pull out `ParamEnvAnd` and remove `QueryKey`

[rust.git] / src / librustc / traits / query / mod.rs

diff --git a/src/librustc/traits/query/mod.rs b/src/librustc/traits/query/mod.rs
index 96034dd935ca8aa79afbf5b52dd2c9d3be69fe52..54b67edb1360b91d1d1fe3dab4433b6f4ef5c667 100644 (file)
--- a/src/librustc/traits/query/mod.rs
+++ b/src/librustc/traits/query/mod.rs
@@ -34,16 +34,16 @@
     Canonical<'tcx, ty::ParamEnvAnd<'tcx, ty::Predicate<'tcx>>>;
 
 pub type CanonicalTypeOpEqGoal<'tcx> =
-    Canonical<'tcx, type_op::eq::Eq<'tcx>>;
+    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::eq::Eq<'tcx>>>;
 
 pub type CanonicalTypeOpSubtypeGoal<'tcx> =
-    Canonical<'tcx, type_op::subtype::Subtype<'tcx>>;
+    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::subtype::Subtype<'tcx>>>;
 
 pub type CanonicalTypeOpProvePredicateGoal<'tcx> =
-    Canonical<'tcx, type_op::prove_predicate::ProvePredicate<'tcx>>;
+    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::prove_predicate::ProvePredicate<'tcx>>>;
 
 pub type CanonicalTypeOpNormalizeGoal<'tcx, T> =
-    Canonical<'tcx, type_op::normalize::Normalize<'tcx, T>>;
+    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::normalize::Normalize<T>>>;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
 pub struct NoSolution;