Auto merge of #680 - jackh726:chalk-fix, r=nikomatsakis

No environment in Constraints Should have been included in #671. Oops.
rust-lang · Feb 1, 2021 · 0e50bae · 0e50bae
2 parents 02dd128 + 10d6b11
commit 0e50bae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 }]"
         }
     }
 }