Merge pull request #377 from crlf0710/master

Rename field `goals` of type `Goals` to `interned`.

Author: nikomatsakis

chalk-ir/src/debug.rs

@@ -47,7 +47,7 @@ impl<I: Interner> Debug for Goal<I> {
 
 impl<I: Interner> Debug for Goals<I> {
     fn fmt(&self, fmt: &mut Formatter<'_>) -> Result<(), Error> {
-        I::debug_goals(self, fmt).unwrap_or_else(|| write!(fmt, "{:?}", self.goals))
+        I::debug_goals(self, fmt).unwrap_or_else(|| write!(fmt, "{:?}", self.interned))
     }
 }
 

chalk-ir/src/lib.rs

@@ -1376,7 +1376,7 @@ impl<T> UCanonical<T> {
 #[derive(Clone, PartialEq, Eq, Hash, HasInterner)]
 /// A list of goals.
 pub struct Goals<I: Interner> {
-    goals: I::InternedGoals,
+    interned: I::InternedGoals,
 }
 
 impl<I: Interner> Goals<I> {
@@ -1385,13 +1385,13 @@ impl<I: Interner> Goals<I> {
     }
 
     pub fn interned(&self) -> &I::InternedGoals {
-        &self.goals
+        &self.interned
     }
 
     pub fn from(interner: &I, goals: impl IntoIterator<Item = impl CastTo<Goal<I>>>) -> Self {
         use crate::cast::Caster;
         Goals {
-            goals: I::intern_goals(interner, goals.into_iter().casted(interner)),
+            interned: I::intern_goals(interner, goals.into_iter().casted(interner)),
         }
     }
 
@@ -1420,7 +1420,7 @@ impl<I: Interner> Goals<I> {
     }
 
     pub fn as_slice(&self, interner: &I) -> &[Goal<I>] {
-        interner.goals_data(&self.goals)
+        interner.goals_data(&self.interned)
     }
 }