remove derive_links from formality_core

Author: nikomatsakis

crates/formality-core/src/language.rs

@@ -1,6 +1,6 @@
 use crate::cast::UpcastFrom;
-use crate::derive_links::{Term, Variable};
-use crate::variable::{BoundVar, ExistentialVar, UniversalVar};
+use crate::term::Term;
+use crate::variable::{BoundVar, ExistentialVar, UniversalVar, Variable};
 use std::fmt::Debug;
 use std::hash::Hash;
 

crates/formality-core/src/lib.rs

@@ -21,7 +21,6 @@ pub type Fallible<T> = anyhow::Result<T>;
 pub mod binder;
 pub mod cast;
 pub mod collections;
-pub mod derive_links;
 pub mod fixed_point;
 pub mod fold;
 pub mod language;

crates/formality-core/src/parse.rs

@@ -4,9 +4,9 @@ use crate::{
     binder::{fresh_bound_var, Binder},
     cast::To,
     collections::Set,
-    derive_links::Term,
     language::{Kind, Language, Parameter},
     set,
+    term::Term,
     variable::BoundVar,
 };
 use std::fmt::Debug;

crates/formality-core/src/substitution.rs

@@ -1,9 +1,10 @@
 use crate::{
     cast::{Upcast, UpcastFrom},
     collections::{Map, Set},
-    derive_links::{Variable, Visit},
     fold::Fold,
     language::{Language, Parameter},
+    variable::Variable,
+    visit::Visit,
 };
 
 #[derive(Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]

crates/formality-core/src/variable.rs

@@ -1,6 +1,7 @@
 use crate::cast::Upcast;
 use crate::language::Kind;
-use crate::{derive_links::Visit, language::Language};
+use crate::language::Language;
+use crate::visit::Visit;
 
 /// A term representing a variable.
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]