Merge pull request #348 from yaahc/jane/intern-substitution

Add self param to intern_substitution

Author: nikomatsakis

chalk-ir/src/interner.rs

@@ -171,7 +171,7 @@ pub trait Interner: Debug + Copy + Eq + Ord + Hash {
     /// normally invoked directly; instead, you invoke
     /// `GoalsData::intern` (which will ultimately call this
     /// method).
-    fn intern_goals(data: impl IntoIterator<Item = Goal<Self>>) -> Self::InternedGoals;
+    fn intern_goals(&self, data: impl IntoIterator<Item = Goal<Self>>) -> Self::InternedGoals;
 
     /// Lookup the `GoalsData` that was interned to create a `InternedGoals`.
     fn goals_data(goals: &Self::InternedGoals) -> &[Goal<Self>];
@@ -181,6 +181,7 @@ pub trait Interner: Debug + Copy + Eq + Ord + Hash {
     /// `SubstitutionData::intern` (which will ultimately call this
     /// method).
     fn intern_substitution<E>(
+        &self,
         data: impl IntoIterator<Item = Result<Parameter<Self>, E>>,
     ) -> Result<Self::InternedSubstitution, E>;
 
@@ -303,7 +304,10 @@ mod default {
             goal
         }
 
-        fn intern_goals(data: impl IntoIterator<Item = Goal<ChalkIr>>) -> Vec<Goal<ChalkIr>> {
+        fn intern_goals(
+            &self,
+            data: impl IntoIterator<Item = Goal<ChalkIr>>,
+        ) -> Vec<Goal<ChalkIr>> {
             data.into_iter().collect()
         }
 
@@ -312,6 +316,7 @@ mod default {
         }
 
         fn intern_substitution<E>(
+            &self,
             data: impl IntoIterator<Item = Result<Parameter<ChalkIr>, E>>,
         ) -> Result<Vec<Parameter<ChalkIr>>, E> {
             data.into_iter().collect()

chalk-ir/src/lib.rs

@@ -1031,7 +1031,7 @@ impl<I: Interner> Goals<I> {
     pub fn from(interner: &I, goals: impl IntoIterator<Item = impl CastTo<Goal<I>>>) -> Self {
         use crate::cast::Caster;
         Goals {
-            goals: I::intern_goals(goals.into_iter().casted(interner)),
+            goals: I::intern_goals(interner, goals.into_iter().casted(interner)),
         }
     }
 
@@ -1248,7 +1248,7 @@ impl<I: Interner> Substitution<I> {
     ) -> Result<Self, E> {
         use crate::cast::Caster;
         Ok(Substitution {
-            parameters: I::intern_substitution(parameters.into_iter().casted(interner))?,
+            parameters: I::intern_substitution(interner, parameters.into_iter().casted(interner))?,
         })
     }