Use derives

Author: jackh726

Cargo.lock

@@ -16,4 +16,5 @@ default = []
 rustc-hash = { version = "1.1.0" }
 
 chalk-base = { version = "0.10.1-dev", path = "../chalk-base" }
+chalk-derive = { version = "0.10.1-dev", path = "../chalk-derive" }
 chalk-ir = { version = "0.10.1-dev", path = "../chalk-ir" }

chalk-engine/Cargo.toml

@@ -59,12 +59,14 @@ extern crate chalk_base;
 use std::cmp::min;
 use std::usize;
 
-use chalk_ir::interner::Interner;
+use chalk_derive::{Fold, HasInterner, Visit};
+use chalk_ir::interner::{Interner, TargetInterner};
+use chalk_ir::visit::VisitResult;
 use chalk_ir::{
-    AnswerSubst, Canonical, ConstrainedSubst, Constraint, Goal, InEnvironment, Substitution,
+    AnswerSubst, Canonical, ConstrainedSubst, Constraint, DebruijnIndex, Goal, InEnvironment,
+    Substitution,
 };
 
-mod boring_impls;
 pub mod context;
 mod derived;
 pub mod forest;
@@ -92,7 +94,7 @@ index_struct! {
 }
 
 /// The paper describes these as `A :- D | G`.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Fold, Visit, HasInterner)]
 pub struct ExClause<I: Interner> {
     /// The substitution which, applied to the goal of our table,
     /// would yield A.
@@ -176,7 +178,7 @@ impl TimeStamp {
 ///
 /// trying to solve `?T: Foo` would immediately require solving `?T:
 /// Sized`, and hence would flounder.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Fold, Visit)]
 pub struct FlounderedSubgoal<I: Interner> {
     /// Literal that floundered.
     pub floundered_literal: Literal<I>,
@@ -217,7 +219,7 @@ pub struct CompleteAnswer<I: Interner> {
 }
 
 /// Either `A` or `~A`, where `A` is a `Env |- Goal`.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Fold, Visit)]
 pub enum Literal<I: Interner> {
     // FIXME: pub b/c fold
     Positive(InEnvironment<Goal<I>>),
@@ -281,3 +283,9 @@ impl Minimums {
         min(self.positive, self.negative)
     }
 }
+
+chalk_ir::copy_fold!(TableIndex);
+chalk_ir::copy_fold!(TimeStamp);
+
+chalk_ir::const_visit!(TableIndex);
+chalk_ir::const_visit!(TimeStamp);

chalk-engine/src/boring_impls.rs

@@ -233,8 +233,9 @@ macro_rules! copy_fold {
     };
 }
 
-copy_fold!(UniverseIndex);
+copy_fold!(bool);
 copy_fold!(usize);
+copy_fold!(UniverseIndex);
 copy_fold!(PlaceholderIndex);
 copy_fold!(QuantifierKind);
 copy_fold!(DebruijnIndex);

chalk-engine/src/lib.rs

@@ -197,8 +197,9 @@ macro_rules! const_visit {
     };
 }
 
-const_visit!(UniverseIndex);
+const_visit!(bool);
 const_visit!(usize);
+const_visit!(UniverseIndex);
 const_visit!(PlaceholderIndex);
 const_visit!(QuantifierKind);
 const_visit!(DebruijnIndex);