impl visit on ProgramClause(s)

Author: basil-cow

chalk-ir/src/visit/binder_impls.rs

@@ -14,7 +14,9 @@ impl<I: Interner> Visit<I> for Fn<I> {
     where
         I: 'i,
     {
-        self.parameters
+        let interner = visitor.interner();
+        self.substitution
+            .parameters(interner)
             .visit_with(visitor, outer_binder.shifted_in())
     }
 }

chalk-ir/src/visit/boring_impls.rs

@@ -6,8 +6,8 @@
 
 use crate::{
     AssocTypeId, DebruijnIndex, Goals, ImplId, Interner, Parameter, ParameterKind,
-    PlaceholderIndex, ProgramClause, QuantifierKind, StructId, Substitution, SuperVisit, TraitId,
-    UniverseIndex, Visit, VisitResult, Visitor,
+    PlaceholderIndex, ProgramClause, ProgramClauseData, ProgramClauses, QuantifierKind, StructId,
+    Substitution, SuperVisit, TraitId, UniverseIndex, Visit, VisitResult, Visitor,
 };
 use chalk_engine::{context::Context, ExClause, FlounderedSubgoal, Literal};
 use std::{marker::PhantomData, sync::Arc};
@@ -59,6 +59,19 @@ impl<T: Visit<I>, I: Interner> Visit<I> for Vec<T> {
     }
 }
 
+impl<T: Visit<I>, I: Interner> Visit<I> for &[T] {
+    fn visit_with<'i, R: VisitResult>(
+        &self,
+        visitor: &mut dyn Visitor<'i, I, Result = R>,
+        outer_binder: DebruijnIndex,
+    ) -> R
+    where
+        I: 'i,
+    {
+        visit_iter(self.iter(), visitor, outer_binder)
+    }
+}
+
 impl<T: Visit<I>, I: Interner> Visit<I> for Box<T> {
     fn visit_with<'i, R: VisitResult>(
         &self,
@@ -225,13 +238,30 @@ impl<I: Interner> SuperVisit<I> for ProgramClause<I> {
     where
         I: 'i,
     {
-        match self {
-            ProgramClause::Implies(pci) => pci.visit_with(visitor, outer_binder),
-            ProgramClause::ForAll(pci) => pci.visit_with(visitor, outer_binder),
+        let interner = visitor.interner();
+
+        match self.data(interner) {
+            ProgramClauseData::Implies(pci) => pci.visit_with(visitor, outer_binder),
+            ProgramClauseData::ForAll(pci) => pci.visit_with(visitor, outer_binder),
         }
     }
 }
 
+impl<I: Interner> Visit<I> for ProgramClauses<I> {
+    fn visit_with<'i, R: VisitResult>(
+        &self,
+        visitor: &mut dyn Visitor<'i, I, Result = R>,
+        outer_binder: DebruijnIndex,
+    ) -> R
+    where
+        I: 'i,
+    {
+        let interner = visitor.interner();
+
+        visit_iter(self.iter(interner), visitor, outer_binder)
+    }
+}
+
 impl<I: Interner> Visit<I> for PhantomData<I> {
     fn visit_with<'i, R: VisitResult>(
         &self,

chalk-solve/src/clauses/env_elaborator.rs

@@ -4,7 +4,6 @@ use crate::clauses::match_type_name;
 use crate::DomainGoal;
 use crate::FromEnv;
 use crate::ProgramClause;
-use crate::ProgramClauseData;
 use crate::RustIrDatabase;
 use crate::Ty;
 use crate::TyData;