From 10d6b118056adfd1d0c4247a586d4851c16e23ad Mon Sep 17 00:00:00 2001
From: Jack Huey <jack.huey@umassmed.edu>
Date: Sat, 30 Jan 2021 17:03:02 -0500
Subject: [PATCH] No environment in Constraints

---
 chalk-solve/src/clauses.rs | 4 ++--
 tests/test/generators.rs   | 2 +-
 tests/test/unsize.rs       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/chalk-solve/src/clauses.rs b/chalk-solve/src/clauses.rs
index 0d44bf25e7f..85b6f4da8d5 100644
--- a/chalk-solve/src/clauses.rs
+++ b/chalk-solve/src/clauses.rs
@@ -534,7 +534,7 @@ pub fn program_clauses_that_could_match<I: Interner>(
                             b: b.clone(),
                         })),
                         Some(InEnvironment::new(
-                            environment,
+                            &Environment::new(interner),
                             Constraint::LifetimeOutlives(a, b),
                         )),
                     );
@@ -550,7 +550,7 @@ pub fn program_clauses_that_could_match<I: Interner>(
                             lifetime: lifetime.clone(),
                         })),
                         Some(InEnvironment::new(
-                            environment,
+                            &Environment::new(interner),
                             Constraint::TypeOutlives(ty, lifetime),
                         )),
                     )
diff --git a/tests/test/generators.rs b/tests/test/generators.rs
index 4c3b428848f..41635cf2dab 100644
--- a/tests/test/generators.rs
+++ b/tests/test/generators.rs
@@ -67,7 +67,7 @@ fn generator_test() {
                 }
             }
         } yields {
-            "Unique; substitution [], lifetime constraints [InEnvironment { environment: Env([for<> FromEnv(!1_0: Send)]), goal: '!2_0: '!2_1 }, InEnvironment { environment: Env([for<> FromEnv(!1_0: Send)]), goal: '!2_1: '!2_0 }]"
+            "Unique; substitution [], lifetime constraints [InEnvironment { environment: Env([]), goal: '!2_0: '!2_1 }, InEnvironment { environment: Env([]), goal: '!2_1: '!2_0 }]"
         }
 
         goal {
diff --git a/tests/test/unsize.rs b/tests/test/unsize.rs
index cef807a220b..a0f1c9729f8 100644
--- a/tests/test/unsize.rs
+++ b/tests/test/unsize.rs
@@ -309,7 +309,7 @@ fn ty_to_dyn_unsizing() {
                 }
             }
         } yields {
-            "Unique; substitution [], lifetime constraints [InEnvironment { environment: Env([for<> FromEnv(!2_0:Sized)]), goal: FooNotSized<!2_0>: '!1_0 }]"
+            "Unique; substitution [], lifetime constraints [InEnvironment { environment: Env([]), goal: FooNotSized<!2_0>: '!1_0 }]"
         }
     }
 }