From 7af18e2312fcb3f4f9a6fa225e548c67300bb783 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 6 Oct 2023 13:32:39 -0400 Subject: [PATCH] Move the EmacsField enum since it has nothing to do with ElispFact. --- src/compare/diff.rs | 2 +- src/compare/elisp_fact.rs | 6 ------ src/compare/macros.rs | 6 ++++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/compare/diff.rs b/src/compare/diff.rs index 739aa9c3..788a2d2b 100644 --- a/src/compare/diff.rs +++ b/src/compare/diff.rs @@ -13,8 +13,8 @@ use super::util::get_property_boolean; use super::util::get_property_numeric; use super::util::get_property_quoted_string; use super::util::get_property_unquoted_atom; -use crate::compare::elisp_fact::EmacsField; use crate::compare::macros::compare_properties; +use crate::compare::macros::EmacsField; use crate::types::AngleLink; use crate::types::AstNode; use crate::types::BabelCall; diff --git a/src/compare/elisp_fact.rs b/src/compare/elisp_fact.rs index 8f97ed3d..fd2810b0 100644 --- a/src/compare/elisp_fact.rs +++ b/src/compare/elisp_fact.rs @@ -550,9 +550,3 @@ impl<'s> ElispFact<'s> for PlainText<'s> { "plain-text".into() } } - -#[derive(Debug)] -pub(crate) enum EmacsField<'s> { - Required(&'s str), - Optional(&'s str), -} diff --git a/src/compare/macros.rs b/src/compare/macros.rs index 463dd9b1..4070e77a 100644 --- a/src/compare/macros.rs +++ b/src/compare/macros.rs @@ -1,3 +1,9 @@ +#[derive(Debug)] +pub(crate) enum EmacsField<'s> { + Required(&'s str), + Optional(&'s str), +} + /// Create iterators for ast nodes where it only has to iterate over children macro_rules! compare_properties { ($emacs:expr, $($emacs_field:expr, $rust_value:expr, $compare_fn: ident),+) => {