Add region constraints in recursive solver

Author: jackh726

chalk-solve/src/recursive/fulfill.rs

@@ -10,8 +10,9 @@ use chalk_ir::interner::{HasInterner, Interner};
 use chalk_ir::zip::Zip;
 use chalk_ir::{debug, debug_heading};
 use chalk_ir::{
-    Canonical, ConstrainedSubst, Constraint, Environment, EqGoal, Fallible, Goal, GoalData,
-    InEnvironment, NoSolution, QuantifierKind, Substitution, UCanonical, UniverseMap,
+    Canonical, ConstrainedSubst, Constraint, DomainGoal, Environment, EqGoal, Fallible, Goal,
+    GoalData, InEnvironment, LifetimeOutlives, NoSolution, QuantifierKind, Substitution,
+    UCanonical, UniverseMap, WhereClause,
 };
 use rustc_hash::FxHashSet;
 use std::fmt::Debug;
@@ -207,10 +208,18 @@ impl<'s, 'db, I: Interner> Fulfill<'s, 'db, I> {
                 let in_env = InEnvironment::new(environment, subgoal.clone());
                 self.push_obligation(Obligation::Refute(in_env));
             }
-            GoalData::DomainGoal(_) => {
-                let in_env = InEnvironment::new(environment, goal);
-                self.push_obligation(Obligation::Prove(in_env));
-            }
+            GoalData::DomainGoal(domain_goal) => match domain_goal {
+                DomainGoal::Holds(WhereClause::LifetimeOutlives(LifetimeOutlives { a, b })) => {
+                    self.constraints.insert(InEnvironment::new(
+                        &environment,
+                        Constraint::Outlives(a.clone(), b.clone()),
+                    ));
+                }
+                _ => {
+                    let in_env = InEnvironment::new(environment, goal);
+                    self.push_obligation(Obligation::Prove(in_env));
+                }
+            },
             GoalData::EqGoal(EqGoal { a, b }) => {
                 self.unify(&environment, &a, &b)?;
             }

tests/test/misc.rs

@@ -627,7 +627,7 @@ fn lifetime_outlives_constraints() {
             exists<'a, 'b> {
                 Bar: Foo<'a, 'b>
             }
-        } yields[SolverChoice::slg(10, None)] {
+        } yields {
             "Unique; for<?U0,?U0> { substitution [?0 := '^0.0, ?1 := '^0.1], lifetime constraints [InEnvironment { environment: Env([]), goal: '^0.0: '^0.1 }] }"
         }
 
@@ -637,7 +637,7 @@ fn lifetime_outlives_constraints() {
                     Bar: Foo<'a, 'b>
                 }
             }
-        } yields[SolverChoice::slg(10, None)] {
+        } yields {
             "Unique; for<?U1> { substitution [?0 := '^0.0], lifetime constraints [InEnvironment { environment: Env([]), goal: '!1_0: '^0.0 }] }"
         }
     }