Rename SuperVisit to TypeSuperVisitable

Author: eggyal

chalk-derive/src/lib.rs

@@ -119,7 +119,7 @@ enum DeriveKind {
 
 decl_derive!([HasInterner, attributes(has_interner)] => derive_has_interner);
 decl_derive!([TypeVisitable, attributes(has_interner)] => derive_type_visitable);
-decl_derive!([SuperVisit, attributes(has_interner)] => derive_super_visit);
+decl_derive!([TypeSuperVisitable, attributes(has_interner)] => derive_type_super_visitable);
 decl_derive!([TypeFoldable, attributes(has_interner)] => derive_type_foldable);
 decl_derive!([Zip, attributes(has_interner)] => derive_zip);
 
@@ -148,11 +148,11 @@ fn derive_type_visitable(s: synstructure::Structure) -> TokenStream {
     )
 }
 
-/// Same as TypeVisitable, but derives SuperVisit instead
-fn derive_super_visit(s: synstructure::Structure) -> TokenStream {
+/// Same as TypeVisitable, but derives TypeSuperVisitable instead
+fn derive_type_super_visitable(s: synstructure::Structure) -> TokenStream {
     derive_any_type_visitable(
         s,
-        parse_quote! { SuperVisit },
+        parse_quote! { TypeSuperVisitable },
         parse_quote! { super_visit_with },
     )
 }

chalk-ir/src/lib.rs

@@ -9,8 +9,8 @@ extern crate self as chalk_ir;
 use crate::cast::{Cast, CastTo, Caster};
 use crate::fold::shift::Shift;
 use crate::fold::{Folder, Subst, TypeFoldable, TypeSuperFoldable};
-use crate::visit::{SuperVisit, TypeVisitable, VisitExt, Visitor};
-use chalk_derive::{HasInterner, SuperVisit, TypeFoldable, TypeVisitable, Zip};
+use crate::visit::{TypeSuperVisitable, TypeVisitable, VisitExt, Visitor};
+use chalk_derive::{HasInterner, TypeFoldable, TypeSuperVisitable, TypeVisitable, Zip};
 use std::marker::PhantomData;
 use std::ops::ControlFlow;
 
@@ -1733,7 +1733,7 @@ where
 }
 
 /// Where clauses that can be written by a Rust programmer.
-#[derive(Clone, PartialEq, Eq, Hash, TypeFoldable, SuperVisit, HasInterner, Zip)]
+#[derive(Clone, PartialEq, Eq, Hash, TypeFoldable, TypeSuperVisitable, HasInterner, Zip)]
 pub enum WhereClause<I: Interner> {
     /// Type implements a trait.
     Implemented(TraitRef<I>),
@@ -1831,7 +1831,7 @@ where
 /// A "domain goal" is a goal that is directly about Rust, rather than a pure
 /// logical statement. As much as possible, the Chalk solver should avoid
 /// decomposing this enum, and instead treat its values opaquely.
-#[derive(Clone, PartialEq, Eq, Hash, TypeFoldable, SuperVisit, HasInterner, Zip)]
+#[derive(Clone, PartialEq, Eq, Hash, TypeFoldable, TypeSuperVisitable, HasInterner, Zip)]
 pub enum DomainGoal<I: Interner> {
     /// Simple goal that is true if the where clause is true.
     Holds(WhereClause<I>),

chalk-ir/src/visit.rs

@@ -202,9 +202,9 @@ pub trait TypeVisitable<I: Interner>: Debug {
 }
 
 /// For types where "visit" invokes a callback on the `visitor`, the
-/// `SuperVisit` trait captures the recursive behavior that visits all
+/// `TypeSuperVisitable` trait captures the recursive behavior that visits all
 /// the contents of the type.
-pub trait SuperVisit<I: Interner>: TypeVisitable<I> {
+pub trait TypeSuperVisitable<I: Interner>: TypeVisitable<I> {
     /// Recursively visits the type contents.
     fn super_visit_with<B>(
         &self,
@@ -227,7 +227,7 @@ impl<I: Interner> TypeVisitable<I> for Ty<I> {
 }
 
 /// "Super visit" for a type invokes the more detailed callbacks on the type
-impl<I> SuperVisit<I> for Ty<I>
+impl<I> TypeSuperVisitable<I> for Ty<I>
 where
     I: Interner,
 {
@@ -311,7 +311,7 @@ impl<I: Interner> TypeVisitable<I> for Lifetime<I> {
     }
 }
 
-impl<I: Interner> SuperVisit<I> for Lifetime<I> {
+impl<I: Interner> TypeSuperVisitable<I> for Lifetime<I> {
     fn super_visit_with<B>(
         &self,
         visitor: &mut dyn Visitor<I, BreakTy = B>,
@@ -348,7 +348,7 @@ impl<I: Interner> TypeVisitable<I> for Const<I> {
     }
 }
 
-impl<I: Interner> SuperVisit<I> for Const<I> {
+impl<I: Interner> TypeSuperVisitable<I> for Const<I> {
     fn super_visit_with<B>(
         &self,
         visitor: &mut dyn Visitor<I, BreakTy = B>,
@@ -382,7 +382,7 @@ impl<I: Interner> TypeVisitable<I> for Goal<I> {
     }
 }
 
-impl<I: Interner> SuperVisit<I> for Goal<I> {
+impl<I: Interner> TypeSuperVisitable<I> for Goal<I> {
     fn super_visit_with<B>(
         &self,
         visitor: &mut dyn Visitor<I, BreakTy = B>,

chalk-ir/src/visit/boring_impls.rs

@@ -8,8 +8,8 @@ use crate::{
     try_break, AdtId, AssocTypeId, ClausePriority, ClosureId, Constraints, ControlFlow,
     DebruijnIndex, FloatTy, FnDefId, ForeignDefId, GeneratorId, GenericArg, Goals, ImplId, IntTy,
     Interner, Mutability, OpaqueTyId, PlaceholderIndex, ProgramClause, ProgramClauses,
-    QuantifiedWhereClauses, QuantifierKind, Safety, Scalar, Substitution, SuperVisit, TraitId,
-    TypeVisitable, UintTy, UniverseIndex, Visitor,
+    QuantifiedWhereClauses, QuantifierKind, Safety, Scalar, Substitution, TraitId,
+    TypeSuperVisitable, TypeVisitable, UintTy, UniverseIndex, Visitor,
 };
 use std::{marker::PhantomData, sync::Arc};
 
@@ -202,7 +202,7 @@ id_visit!(ClosureId);
 id_visit!(GeneratorId);
 id_visit!(ForeignDefId);
 
-impl<I: Interner> SuperVisit<I> for ProgramClause<I> {
+impl<I: Interner> TypeSuperVisitable<I> for ProgramClause<I> {
     fn super_visit_with<B>(
         &self,
         visitor: &mut dyn Visitor<I, BreakTy = B>,

chalk-solve/src/clauses/builtin_traits/unsize.rs

@@ -8,7 +8,7 @@ use crate::{Interner, RustIrDatabase, TraitRef, WellKnownTrait};
 use chalk_ir::{
     cast::Cast,
     interner::HasInterner,
-    visit::{SuperVisit, TypeVisitable, Visitor},
+    visit::{TypeSuperVisitable, TypeVisitable, Visitor},
     Binders, Const, ConstValue, DebruijnIndex, DomainGoal, DynTy, EqGoal, Goal, LifetimeOutlives,
     QuantifiedWhereClauses, Substitution, TraitId, Ty, TyKind, TypeOutlives, WhereClause,
 };

chalk-solve/src/logging_db/id_collector.rs

@@ -3,7 +3,7 @@ use crate::RustIrDatabase;
 use chalk_ir::{
     interner::Interner,
     visit::Visitor,
-    visit::{SuperVisit, TypeVisitable},
+    visit::{TypeSuperVisitable, TypeVisitable},
     AliasTy, DebruijnIndex, TyKind, WhereClause,
 };
 use std::ops::ControlFlow;

chalk-solve/src/solve/truncate.rs

@@ -2,7 +2,7 @@
 
 use crate::infer::InferenceTable;
 use chalk_ir::interner::Interner;
-use chalk_ir::visit::{SuperVisit, TypeVisitable, Visitor};
+use chalk_ir::visit::{TypeSuperVisitable, TypeVisitable, Visitor};
 use chalk_ir::*;
 use std::cmp::max;
 use std::ops::ControlFlow;