aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_ty/src/traits/chalk
diff options
context:
space:
mode:
authorFlorian Diebold <[email protected]>2021-03-21 19:19:07 +0000
committerFlorian Diebold <[email protected]>2021-03-21 19:19:07 +0000
commitc4fd3f47f5b4f34476f8f085f2412a46aa0fd24f (patch)
tree82b6b318da1564cabd0225dfb3c67433f80b8ab8 /crates/hir_ty/src/traits/chalk
parentf7be314579db29f64ef660aef1896da33d420ad6 (diff)
Align InEnvironment with Chalk
This in particular means storing a chalk_ir::Environment, not our TraitEnvironment. This makes InEnvironment not usable for Type, where we need to keep the full TraitEnvironment.
Diffstat (limited to 'crates/hir_ty/src/traits/chalk')
-rw-r--r--crates/hir_ty/src/traits/chalk/mapping.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/crates/hir_ty/src/traits/chalk/mapping.rs b/crates/hir_ty/src/traits/chalk/mapping.rs
index 58d8f2894..aef6b8a15 100644
--- a/crates/hir_ty/src/traits/chalk/mapping.rs
+++ b/crates/hir_ty/src/traits/chalk/mapping.rs
@@ -455,10 +455,7 @@ where
455 type Chalk = chalk_ir::InEnvironment<T::Chalk>; 455 type Chalk = chalk_ir::InEnvironment<T::Chalk>;
456 456
457 fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::InEnvironment<T::Chalk> { 457 fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::InEnvironment<T::Chalk> {
458 chalk_ir::InEnvironment { 458 chalk_ir::InEnvironment { environment: self.environment, goal: self.goal.to_chalk(db) }
459 environment: self.environment.env.clone(),
460 goal: self.value.to_chalk(db),
461 }
462 } 459 }
463 460
464 fn from_chalk( 461 fn from_chalk(