use macros from formality_core in formality_types

Author: nikomatsakis

Cargo.lock

@@ -9,7 +9,6 @@ edition = "2021"
 anyhow = "1.0.65"
 lazy_static = "1.4.0"
 formality-core = { path = "../formality-core" }
-formality-macros = { path = "../formality-macros" }
 tracing = "0.1"
 contracts = "0.6.3"
 stacker = "0.1.15"

crates/formality-types/Cargo.toml

@@ -3,7 +3,7 @@ mod valtree;
 use crate::cast::{DowncastTo, Upcast, UpcastFrom};
 
 use super::{Parameter, Ty, Variable};
-use formality_macros::{term, Visit};
+use formality_core::{term, Visit};
 use std::sync::Arc;
 pub use valtree::*;
 

crates/formality-types/src/grammar/consts.rs

@@ -1,4 +1,4 @@
-use formality_macros::Visit;
+use formality_core::Visit;
 
 use crate::cast::{Upcast, UpcastFrom};
 

crates/formality-types/src/grammar/consts/valtree.rs

@@ -1,4 +1,4 @@
-use formality_macros::term;
+use formality_core::term;
 
 use crate::cast::To;
 use crate::cast::Upcast;
@@ -119,11 +119,7 @@ impl Predicate {
             Predicate::AliasEq(AliasTy { name, parameters }, ty) => {
                 let mut params = parameters.clone();
                 params.push(ty.clone().upcast());
-                (
-                    Skeleton::AliasEq(name.clone()),
-                    params,
-                )
-                
+                (Skeleton::AliasEq(name.clone()), params)
             }
             Predicate::WellFormedTraitRef(TraitRef {
                 trait_id,

crates/formality-types/src/grammar/formulas.rs

@@ -1,5 +1,5 @@
 use contracts::requires;
-use formality_macros::{term, Visit};
+use formality_core::{term, Visit};
 use std::{collections::BTreeSet, sync::Arc};
 
 mod debug_impls;

crates/formality-types/src/grammar/ty.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use formality_macros::term;
+use formality_core::term;
 
 use crate::{
     cast::{DowncastFrom, DowncastTo, Upcast, UpcastFrom, Upcasted},

crates/formality-types/src/grammar/wc.rs

@@ -2,9 +2,9 @@
 
 use std::sync::Arc;
 
-use formality_macros::{term, test};
+use formality_core::{term, test};
 
-use crate::{judgment_fn};
+use crate::judgment_fn;
 
 #[term($edges)]
 struct Graph {

crates/formality-types/src/judgment/test_filtered.rs

@@ -2,7 +2,7 @@
 
 use std::sync::Arc;
 
-use formality_macros::term;
+use formality_core::term;
 
 use crate::judgment_fn;