New plans for macros

About to move them completely to stdlib

orchid-base/src/gen/impls.rs

@@ -1,8 +1,7 @@
 use std::any::TypeId;
 
 use itertools::Itertools;
-use orchid_api::expr::{Clause, Expr};
-use orchid_api::location::Location;
+use crate::api;
 
 use super::traits::{GenClause, Generable};
 use crate::intern::{deintern, intern};

orchid-base/src/gen/tpl.rs

@@ -1,7 +1,7 @@
 //! Various elemental components to build expression trees that all implement
 //! [GenClause].
 
-use orchid_api::atom::Atom;
+use crate::api;
 
 use super::traits::{GenClause, Generable};
 

orchid-base/src/gen/traits.rs

@@ -5,7 +5,7 @@ use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::fmt;
 
-use orchid_api::atom::Atom;
+use crate::api;
 
 /// Representations of the Orchid expression tree that can describe basic
 /// language elements.

orchid-base/src/gen/tree.rs

@@ -4,8 +4,7 @@
 use std::fmt;
 
 use dyn_clone::{clone_box, DynClone};
-use orchid_api::atom::Atom;
-use orchid_api::expr::Expr;
+use crate::api;
 use trait_set::trait_set;
 
 use super::tpl;