latest

Author: yaahc

chalk-engine/src/context.rs

@@ -172,9 +172,6 @@ pub trait Context: Clone + Debug {
     // Used by: simplify
     fn add_clauses(env: &Self::Environment, clauses: Self::ProgramClauses) -> Self::Environment;
 
-    /// Upcast this domain goal into a more general goal.
-    fn into_goal(domain_goal: Self::DomainGoal) -> Self::Goal;
-
     /// Selects the next appropriate subgoal index for evaluation.
     /// Used by: logic
     fn next_subgoal_index(ex_clause: &ExClause<Self>) -> usize;
@@ -265,6 +262,9 @@ pub trait ContextOps<C: Context>: Sized + Clone + Debug + AggregateOps<C> {
     ) -> C::CanonicalAnswerSubst;
 
     fn interner(&self) -> &C::Interner;
+
+    /// Upcast this domain goal into a more general goal.
+    fn into_goal(&self, domain_goal: C::DomainGoal) -> C::Goal;
 }
 
 /// Methods for combining solutions to yield an aggregate solution.

chalk-solve/src/infer/unify.rs

@@ -260,7 +260,7 @@ impl<'t, I: Interner> Unifier<'t, I> {
 
         self.table
             .unify
-            .unify_var_value(var, InferenceValue::from(ty1.clone()))
+            .unify_var_value(var, InferenceValue::from_ty(self.interner, ty1.clone()))
             .unwrap();
         debug!("unify_var_ty: var {:?} set to {:?}", var, ty1);
 
@@ -300,7 +300,7 @@ impl<'t, I: Interner> Unifier<'t, I> {
                     let v = LifetimeData::Placeholder(idx).intern(self.interner);
                     self.table
                         .unify
-                        .unify_var_value(var, InferenceValue::from(v))
+                        .unify_var_value(var, InferenceValue::from_lifetime(self.interner, v))
                         .unwrap();
                     Ok(())
                 } else {

chalk-solve/src/infer/var.rs

@@ -92,7 +92,11 @@ pub(crate) enum InferenceValue<I: Interner> {
 }
 
 impl<I: Interner> InferenceValue<I> {
-    fn from(interner: &I, lifetime: Lifetime<I>) -> Self {
+    pub fn from_ty(interner: &I, ty: Ty<I>) -> Self {
+        InferenceValue::Bound(ty.cast(interner))
+    }
+
+    pub fn from_lifetime(interner: &I, lifetime: Lifetime<I>) -> Self {
         InferenceValue::Bound(lifetime.cast(interner))
     }
 }

chalk-solve/src/solve/slg.rs

@@ -167,10 +167,6 @@ impl<I: Interner> context::Context for SlgContext<I> {
         Environment::add_clauses(env, clauses)
     }
 
-    fn into_goal(domain_goal: DomainGoal<I>) -> Goal<I> {
-        domain_goal.cast()
-    }
-
     // Used by: logic
     fn next_subgoal_index(ex_clause: &ExClause<SlgContext<I>>) -> usize {
         // For now, we always pick the last subgoal in the
@@ -334,6 +330,11 @@ impl<'me, I: Interner> context::ContextOps<SlgContext<I>> for SlgContextOps<'me,
     fn interner(&self) -> &I {
         self.program.interner()
     }
+
+    fn into_goal(&self, domain_goal: DomainGoal<I>) -> Goal<I> {
+        domain_goal.cast(self.program.interner())
+    }
+
 }
 
 impl<I: Interner> TruncatingInferenceTable<I> {