From 44483b4d543605e84a091c92ec51e236e78849fb Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 30 Dec 2023 22:02:43 -0500 Subject: [PATCH] Break util up into modules. --- src/compare/compare.rs | 10 +- src/compare/diff.rs | 8 +- src/compare/util.rs | 2 +- src/lib.rs | 2 +- src/util/cli.rs | 191 +++++++++++++++++++++++++ src/util/mod.rs | 242 +------------------------------- src/util/terminal.rs | 42 ++++++ src/wasm/angle_link.rs | 2 +- src/wasm/babel_call.rs | 2 +- src/wasm/bold.rs | 2 +- src/wasm/center_block.rs | 2 +- src/wasm/citation.rs | 2 +- src/wasm/citation_reference.rs | 2 +- src/wasm/clock.rs | 2 +- src/wasm/code.rs | 2 +- src/wasm/comment.rs | 2 +- src/wasm/comment_block.rs | 2 +- src/wasm/diary_sexp.rs | 2 +- src/wasm/document.rs | 2 +- src/wasm/drawer.rs | 2 +- src/wasm/dynamic_block.rs | 2 +- src/wasm/entity.rs | 2 +- src/wasm/example_block.rs | 2 +- src/wasm/export_block.rs | 2 +- src/wasm/export_snippet.rs | 2 +- src/wasm/fixed_width_area.rs | 2 +- src/wasm/footnote_definition.rs | 2 +- src/wasm/footnote_reference.rs | 2 +- src/wasm/headline.rs | 2 +- src/wasm/horizontal_rule.rs | 2 +- src/wasm/inline_babel_call.rs | 2 +- src/wasm/inline_source_block.rs | 2 +- src/wasm/italic.rs | 2 +- src/wasm/keyword.rs | 2 +- src/wasm/latex_environment.rs | 2 +- src/wasm/latex_fragment.rs | 2 +- src/wasm/line_break.rs | 2 +- src/wasm/macros.rs | 3 +- src/wasm/node_property.rs | 2 +- src/wasm/org_macro.rs | 2 +- src/wasm/paragraph.rs | 2 +- src/wasm/plain_link.rs | 2 +- src/wasm/plain_list.rs | 2 +- src/wasm/plain_list_item.rs | 2 +- src/wasm/plain_text.rs | 2 +- src/wasm/planning.rs | 2 +- src/wasm/property_drawer.rs | 2 +- src/wasm/quote_block.rs | 2 +- src/wasm/radio_link.rs | 2 +- src/wasm/radio_target.rs | 2 +- src/wasm/regular_link.rs | 2 +- src/wasm/section.rs | 2 +- src/wasm/special_block.rs | 2 +- src/wasm/src_block.rs | 2 +- src/wasm/statistics_cookie.rs | 2 +- src/wasm/strike_through.rs | 2 +- src/wasm/subscript.rs | 2 +- src/wasm/superscript.rs | 2 +- src/wasm/table.rs | 2 +- src/wasm/table_cell.rs | 2 +- src/wasm/table_row.rs | 2 +- src/wasm/target.rs | 2 +- src/wasm/timestamp.rs | 2 +- src/wasm/underline.rs | 2 +- src/wasm/verbatim.rs | 2 +- src/wasm/verse_block.rs | 2 +- src/wasm_test/diff.rs | 4 +- src/wasm_test/runner.rs | 10 +- 68 files changed, 316 insertions(+), 314 deletions(-) create mode 100644 src/util/cli.rs create mode 100644 src/util/terminal.rs diff --git a/src/compare/compare.rs b/src/compare/compare.rs index 0a8cb897..6c26eca3 100644 --- a/src/compare/compare.rs +++ b/src/compare/compare.rs @@ -7,11 +7,11 @@ use crate::context::GlobalSettings; use crate::context::LocalFileAccessInterface; use crate::parser::parse_file_with_settings; use crate::parser::parse_with_settings; -use crate::util::emacs_parse_anonymous_org_document; -use crate::util::emacs_parse_file_org_document; -use crate::util::foreground_color; -use crate::util::print_versions; -use crate::util::reset_color; +use crate::util::cli::emacs_parse_anonymous_org_document; +use crate::util::cli::emacs_parse_file_org_document; +use crate::util::cli::print_versions; +use crate::util::terminal::foreground_color; +use crate::util::terminal::reset_color; pub async fn run_anonymous_compare>( org_contents: P, diff --git a/src/compare/diff.rs b/src/compare/diff.rs index 0e0ca735..5f8097a7 100644 --- a/src/compare/diff.rs +++ b/src/compare/diff.rs @@ -16,8 +16,6 @@ use super::compare_field::compare_property_retain_labels; use super::compare_field::compare_property_set_of_quoted_string; use super::compare_field::compare_property_single_ast_node; use super::compare_field::compare_property_unquoted_atom; -use super::elisp_fact::ElispFact; -use super::elisp_fact::GetElispFact; use super::sexp::unquote; use super::sexp::Token; use super::util::affiliated_keywords_names; @@ -109,8 +107,10 @@ use crate::types::Verbatim; use crate::types::VerseBlock; use crate::types::WarningDelayType; use crate::types::Year; -use crate::util::foreground_color; -use crate::util::reset_color; +use crate::util::elisp_fact::ElispFact; +use crate::util::elisp_fact::GetElispFact; +use crate::util::terminal::foreground_color; +use crate::util::terminal::reset_color; #[derive(Debug)] pub enum DiffEntry<'b, 's> { diff --git a/src/compare/util.rs b/src/compare/util.rs index f0a0b03d..4b8ff635 100644 --- a/src/compare/util.rs +++ b/src/compare/util.rs @@ -8,7 +8,6 @@ use super::compare_field::compare_property_quoted_string; use super::compare_field::ComparePropertiesResult; use super::diff::DiffEntry; use super::diff::DiffStatus; -use super::elisp_fact::GetElispFact; use super::sexp::Token; use crate::compare::diff::compare_ast_node; use crate::compare::sexp::unquote; @@ -16,6 +15,7 @@ use crate::types::AffiliatedKeywordValue; use crate::types::AstNode; use crate::types::GetAffiliatedKeywords; use crate::types::StandardProperties; +use crate::util::elisp_fact::GetElispFact; /// Check if the child string slice is a slice of the parent string slice. fn is_slice_of(parent: &str, child: &str) -> bool { diff --git a/src/lib.rs b/src/lib.rs index 49242285..96af81d3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,7 +12,7 @@ extern crate test; // TODO: I only include compare to use some shared stuff like sexp and DiffResult. Ideally, this would be moved to a shared module. #[cfg(any(feature = "compare", feature = "wasm_test"))] pub mod compare; -#[cfg(any(feature = "compare", feature = "wasm_test"))] +#[cfg(any(feature = "compare", feature = "wasm", feature = "wasm_test"))] pub mod util; #[cfg(any(feature = "wasm", feature = "wasm_test"))] pub mod wasm; diff --git a/src/util/cli.rs b/src/util/cli.rs new file mode 100644 index 00000000..3591dff3 --- /dev/null +++ b/src/util/cli.rs @@ -0,0 +1,191 @@ +use std::path::Path; + +use tokio::process::Command; + +use crate::settings::GlobalSettings; +use crate::settings::HeadlineLevelFilter; + +pub async fn print_versions() -> Result<(), Box> { + eprintln!("Using emacs version: {}", get_emacs_version().await?.trim()); + eprintln!( + "Using org-mode version: {}", + get_org_mode_version().await?.trim() + ); + Ok(()) +} + +pub(crate) async fn get_emacs_version() -> Result> { + let elisp_script = r#"(progn + (message "%s" (version)) +)"#; + let mut cmd = Command::new("emacs"); + let cmd = cmd + .arg("-q") + .arg("--no-site-file") + .arg("--no-splash") + .arg("--batch") + .arg("--eval") + .arg(elisp_script); + + let out = cmd.output().await?; + out.status.exit_ok()?; + Ok(String::from_utf8(out.stderr)?) +} + +pub(crate) async fn get_org_mode_version() -> Result> { + let elisp_script = r#"(progn + (org-mode) + (message "%s" (org-version nil t nil)) +)"#; + let mut cmd = Command::new("emacs"); + let cmd = cmd + .arg("-q") + .arg("--no-site-file") + .arg("--no-splash") + .arg("--batch") + .arg("--eval") + .arg(elisp_script); + + let out = cmd.output().await?; + out.status.exit_ok()?; + Ok(String::from_utf8(out.stderr)?) +} + +pub(crate) async fn emacs_parse_anonymous_org_document<'g, 's, C>( + file_contents: C, + global_settings: &GlobalSettings<'g, 's>, +) -> Result> +where + C: AsRef, +{ + let escaped_file_contents = escape_elisp_string(file_contents); + let elisp_script = format!( + r#"(progn + (erase-buffer) + (require 'org) + (defun org-table-align () t) + (insert "{escaped_file_contents}") + {global_settings} + (org-mode) + (message "%s" (pp-to-string (org-element-parse-buffer))) +)"#, + escaped_file_contents = escaped_file_contents, + global_settings = global_settings_elisp(global_settings) + ); + let mut cmd = Command::new("emacs"); + let cmd = cmd + .arg("-q") + .arg("--no-site-file") + .arg("--no-splash") + .arg("--batch") + .arg("--eval") + .arg(elisp_script); + let out = cmd.output().await?; + let status = out.status.exit_ok(); + if status.is_err() { + eprintln!( + "Emacs errored out: {}\n{}", + String::from_utf8(out.stdout)?, + String::from_utf8(out.stderr)? + ); + status?; + unreachable!(); + } + let org_sexp = out.stderr; + Ok(String::from_utf8(org_sexp)?) +} + +pub(crate) async fn emacs_parse_file_org_document<'g, 's, P>( + file_path: P, + global_settings: &GlobalSettings<'g, 's>, +) -> Result> +where + P: AsRef, +{ + let file_path = file_path.as_ref().canonicalize()?; + let containing_directory = file_path.parent().ok_or(format!( + "Failed to get containing directory for path {}", + file_path.display() + ))?; + let elisp_script = format!( + r#"(progn + (require 'org) + (defun org-table-align () t) + (setq vc-handled-backends nil) + {global_settings} + (find-file-read-only "{file_path}") + (org-mode) + (message "%s" (pp-to-string (org-element-parse-buffer))) +)"#, + global_settings = global_settings_elisp(global_settings), + file_path = file_path + .as_os_str() + .to_str() + .expect("File name should be valid utf-8.") + ); + let mut cmd = Command::new("emacs"); + let cmd = cmd + .current_dir(containing_directory) + .arg("-q") + .arg("--no-site-file") + .arg("--no-splash") + .arg("--batch") + .arg("--eval") + .arg(elisp_script); + let out = cmd.output().await?; + let status = out.status.exit_ok(); + if status.is_err() { + eprintln!( + "Emacs errored out: {}\n{}", + String::from_utf8(out.stdout)?, + String::from_utf8(out.stderr)? + ); + status?; + unreachable!(); + } + let org_sexp = out.stderr; + Ok(String::from_utf8(org_sexp)?) +} + +fn escape_elisp_string(file_contents: C) -> String +where + C: AsRef, +{ + let source = file_contents.as_ref(); + let source_len = source.len(); + // We allocate a string 10% larger than the source to account for escape characters. Without this, we would have more allocations during processing. + let mut output = String::with_capacity(source_len + (source_len / 10)); + for c in source.chars() { + match c { + '"' | '\\' => { + output.push('\\'); + output.push(c); + } + _ => { + output.push(c); + } + } + } + output +} + +/// Generate elisp to configure org-mode parsing settings +/// +/// Currently only org-list-allow-alphabetical is supported. +fn global_settings_elisp(global_settings: &GlobalSettings) -> String { + // This string concatenation is wildly inefficient but its only called in tests 🤷. + let mut ret = "".to_owned(); + if global_settings.list_allow_alphabetical { + ret += "(setq org-list-allow-alphabetical t)\n" + } + if global_settings.tab_width != crate::settings::DEFAULT_TAB_WIDTH { + ret += format!("(setq-default tab-width {})", global_settings.tab_width).as_str(); + } + if global_settings.odd_levels_only != HeadlineLevelFilter::default() { + ret += match global_settings.odd_levels_only { + HeadlineLevelFilter::Odd => "(setq org-odd-levels-only t)\n", + HeadlineLevelFilter::OddEven => "(setq org-odd-levels-only nil)\n", + }; + } + ret +} diff --git a/src/util/mod.rs b/src/util/mod.rs index 08076ab4..65bc6ec5 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -1,236 +1,6 @@ -mod elisp_fact; - -use std::borrow::Cow; -use std::path::Path; - -pub(crate) use elisp_fact::ElispFact; -use tokio::process::Command; - -use crate::settings::GlobalSettings; -use crate::settings::HeadlineLevelFilter; - -pub async fn print_versions() -> Result<(), Box> { - eprintln!("Using emacs version: {}", get_emacs_version().await?.trim()); - eprintln!( - "Using org-mode version: {}", - get_org_mode_version().await?.trim() - ); - Ok(()) -} - -pub(crate) async fn get_emacs_version() -> Result> { - let elisp_script = r#"(progn - (message "%s" (version)) -)"#; - let mut cmd = Command::new("emacs"); - let cmd = cmd - .arg("-q") - .arg("--no-site-file") - .arg("--no-splash") - .arg("--batch") - .arg("--eval") - .arg(elisp_script); - - let out = cmd.output().await?; - out.status.exit_ok()?; - Ok(String::from_utf8(out.stderr)?) -} - -pub(crate) async fn get_org_mode_version() -> Result> { - let elisp_script = r#"(progn - (org-mode) - (message "%s" (org-version nil t nil)) -)"#; - let mut cmd = Command::new("emacs"); - let cmd = cmd - .arg("-q") - .arg("--no-site-file") - .arg("--no-splash") - .arg("--batch") - .arg("--eval") - .arg(elisp_script); - - let out = cmd.output().await?; - out.status.exit_ok()?; - Ok(String::from_utf8(out.stderr)?) -} - -pub(crate) async fn emacs_parse_anonymous_org_document<'g, 's, C>( - file_contents: C, - global_settings: &GlobalSettings<'g, 's>, -) -> Result> -where - C: AsRef, -{ - let escaped_file_contents = escape_elisp_string(file_contents); - let elisp_script = format!( - r#"(progn - (erase-buffer) - (require 'org) - (defun org-table-align () t) - (insert "{escaped_file_contents}") - {global_settings} - (org-mode) - (message "%s" (pp-to-string (org-element-parse-buffer))) -)"#, - escaped_file_contents = escaped_file_contents, - global_settings = global_settings_elisp(global_settings) - ); - let mut cmd = Command::new("emacs"); - let cmd = cmd - .arg("-q") - .arg("--no-site-file") - .arg("--no-splash") - .arg("--batch") - .arg("--eval") - .arg(elisp_script); - let out = cmd.output().await?; - let status = out.status.exit_ok(); - if status.is_err() { - eprintln!( - "Emacs errored out: {}\n{}", - String::from_utf8(out.stdout)?, - String::from_utf8(out.stderr)? - ); - status?; - unreachable!(); - } - let org_sexp = out.stderr; - Ok(String::from_utf8(org_sexp)?) -} - -pub(crate) async fn emacs_parse_file_org_document<'g, 's, P>( - file_path: P, - global_settings: &GlobalSettings<'g, 's>, -) -> Result> -where - P: AsRef, -{ - let file_path = file_path.as_ref().canonicalize()?; - let containing_directory = file_path.parent().ok_or(format!( - "Failed to get containing directory for path {}", - file_path.display() - ))?; - let elisp_script = format!( - r#"(progn - (require 'org) - (defun org-table-align () t) - (setq vc-handled-backends nil) - {global_settings} - (find-file-read-only "{file_path}") - (org-mode) - (message "%s" (pp-to-string (org-element-parse-buffer))) -)"#, - global_settings = global_settings_elisp(global_settings), - file_path = file_path - .as_os_str() - .to_str() - .expect("File name should be valid utf-8.") - ); - let mut cmd = Command::new("emacs"); - let cmd = cmd - .current_dir(containing_directory) - .arg("-q") - .arg("--no-site-file") - .arg("--no-splash") - .arg("--batch") - .arg("--eval") - .arg(elisp_script); - let out = cmd.output().await?; - let status = out.status.exit_ok(); - if status.is_err() { - eprintln!( - "Emacs errored out: {}\n{}", - String::from_utf8(out.stdout)?, - String::from_utf8(out.stderr)? - ); - status?; - unreachable!(); - } - let org_sexp = out.stderr; - Ok(String::from_utf8(org_sexp)?) -} - -fn escape_elisp_string(file_contents: C) -> String -where - C: AsRef, -{ - let source = file_contents.as_ref(); - let source_len = source.len(); - // We allocate a string 10% larger than the source to account for escape characters. Without this, we would have more allocations during processing. - let mut output = String::with_capacity(source_len + (source_len / 10)); - for c in source.chars() { - match c { - '"' | '\\' => { - output.push('\\'); - output.push(c); - } - _ => { - output.push(c); - } - } - } - output -} - -/// Generate elisp to configure org-mode parsing settings -/// -/// Currently only org-list-allow-alphabetical is supported. -fn global_settings_elisp(global_settings: &GlobalSettings) -> String { - // This string concatenation is wildly inefficient but its only called in tests 🤷. - let mut ret = "".to_owned(); - if global_settings.list_allow_alphabetical { - ret += "(setq org-list-allow-alphabetical t)\n" - } - if global_settings.tab_width != crate::settings::DEFAULT_TAB_WIDTH { - ret += format!("(setq-default tab-width {})", global_settings.tab_width).as_str(); - } - if global_settings.odd_levels_only != HeadlineLevelFilter::default() { - ret += match global_settings.odd_levels_only { - HeadlineLevelFilter::Odd => "(setq org-odd-levels-only t)\n", - HeadlineLevelFilter::OddEven => "(setq org-odd-levels-only nil)\n", - }; - } - ret -} - -fn should_use_color() -> bool { - !std::env::var("NO_COLOR").is_ok_and(|val| !val.is_empty()) -} - -pub(crate) fn foreground_color(red: u8, green: u8, blue: u8) -> Cow<'static, str> { - if should_use_color() { - format!( - "\x1b[38;2;{red};{green};{blue}m", - red = red, - green = green, - blue = blue - ) - .into() - } else { - Cow::from("") - } -} - -#[allow(dead_code)] -pub(crate) fn background_color(red: u8, green: u8, blue: u8) -> Cow<'static, str> { - if should_use_color() { - format!( - "\x1b[48;2;{red};{green};{blue}m", - red = red, - green = green, - blue = blue - ) - .into() - } else { - Cow::from("") - } -} - -pub(crate) fn reset_color() -> &'static str { - if should_use_color() { - "\x1b[0m" - } else { - "" - } -} +#[cfg(any(feature = "compare", feature = "wasm_test"))] +pub mod cli; +#[cfg(any(feature = "compare", feature = "wasm", feature = "wasm_test"))] +pub mod elisp_fact; +#[cfg(any(feature = "compare", feature = "wasm_test"))] +pub mod terminal; diff --git a/src/util/terminal.rs b/src/util/terminal.rs new file mode 100644 index 00000000..836c7870 --- /dev/null +++ b/src/util/terminal.rs @@ -0,0 +1,42 @@ +use std::borrow::Cow; + +fn should_use_color() -> bool { + !std::env::var("NO_COLOR").is_ok_and(|val| !val.is_empty()) +} + +pub(crate) fn foreground_color(red: u8, green: u8, blue: u8) -> Cow<'static, str> { + if should_use_color() { + format!( + "\x1b[38;2;{red};{green};{blue}m", + red = red, + green = green, + blue = blue + ) + .into() + } else { + Cow::from("") + } +} + +#[allow(dead_code)] +pub(crate) fn background_color(red: u8, green: u8, blue: u8) -> Cow<'static, str> { + if should_use_color() { + format!( + "\x1b[48;2;{red};{green};{blue}m", + red = red, + green = green, + blue = blue + ) + .into() + } else { + Cow::from("") + } +} + +pub(crate) fn reset_color() -> &'static str { + if should_use_color() { + "\x1b[0m" + } else { + "" + } +} diff --git a/src/wasm/angle_link.rs b/src/wasm/angle_link.rs index adfc856d..27a0b760 100644 --- a/src/wasm/angle_link.rs +++ b/src/wasm/angle_link.rs @@ -6,7 +6,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::AngleLink; use crate::types::LinkType; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/babel_call.rs b/src/wasm/babel_call.rs index 59013248..263dadb2 100644 --- a/src/wasm/babel_call.rs +++ b/src/wasm/babel_call.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::BabelCall; use crate::types::GetAffiliatedKeywords; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/bold.rs b/src/wasm/bold.rs index 9bd4a6bd..31804e43 100644 --- a/src/wasm/bold.rs +++ b/src/wasm/bold.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Bold; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/center_block.rs b/src/wasm/center_block.rs index 8035e01f..0c244ca9 100644 --- a/src/wasm/center_block.rs +++ b/src/wasm/center_block.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::CenterBlock; use crate::types::GetAffiliatedKeywords; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/citation.rs b/src/wasm/citation.rs index c638efb2..be2845ed 100644 --- a/src/wasm/citation.rs +++ b/src/wasm/citation.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Citation; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/citation_reference.rs b/src/wasm/citation_reference.rs index 11eff5cd..8816f459 100644 --- a/src/wasm/citation_reference.rs +++ b/src/wasm/citation_reference.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::CitationReference; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/clock.rs b/src/wasm/clock.rs index dce4ec90..f156b305 100644 --- a/src/wasm/clock.rs +++ b/src/wasm/clock.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Clock; use crate::types::ClockStatus; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/code.rs b/src/wasm/code.rs index 3e9ac6a4..db22f7e4 100644 --- a/src/wasm/code.rs +++ b/src/wasm/code.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Code; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/comment.rs b/src/wasm/comment.rs index b16845ec..661cf230 100644 --- a/src/wasm/comment.rs +++ b/src/wasm/comment.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Comment; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/comment_block.rs b/src/wasm/comment_block.rs index d7ccae5c..dfcdc2d9 100644 --- a/src/wasm/comment_block.rs +++ b/src/wasm/comment_block.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::CommentBlock; use crate::types::GetAffiliatedKeywords; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/diary_sexp.rs b/src/wasm/diary_sexp.rs index 3b925852..1b6f11c1 100644 --- a/src/wasm/diary_sexp.rs +++ b/src/wasm/diary_sexp.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::DiarySexp; use crate::types::GetAffiliatedKeywords; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/document.rs b/src/wasm/document.rs index dc75c0e1..0b2bbc08 100644 --- a/src/wasm/document.rs +++ b/src/wasm/document.rs @@ -8,7 +8,7 @@ use super::additional_property::AdditionalPropertyValue; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Document; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/drawer.rs b/src/wasm/drawer.rs index 98c5f8ba..079762e4 100644 --- a/src/wasm/drawer.rs +++ b/src/wasm/drawer.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Drawer; use crate::types::GetAffiliatedKeywords; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/dynamic_block.rs b/src/wasm/dynamic_block.rs index 76e3c9ce..7eb5f78b 100644 --- a/src/wasm/dynamic_block.rs +++ b/src/wasm/dynamic_block.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::DynamicBlock; use crate::types::GetAffiliatedKeywords; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/entity.rs b/src/wasm/entity.rs index 78f82272..b855d9c9 100644 --- a/src/wasm/entity.rs +++ b/src/wasm/entity.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::headline::Noop; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Entity; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/example_block.rs b/src/wasm/example_block.rs index a1466c76..a50fb5d0 100644 --- a/src/wasm/example_block.rs +++ b/src/wasm/example_block.rs @@ -8,7 +8,7 @@ use super::src_block::WasmNumberLinesWrapper; use super::src_block::WasmRetainLabels; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::CharOffsetInLine; use crate::types::ExampleBlock; use crate::types::GetAffiliatedKeywords; diff --git a/src/wasm/export_block.rs b/src/wasm/export_block.rs index 5989ce49..3770606a 100644 --- a/src/wasm/export_block.rs +++ b/src/wasm/export_block.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::ExportBlock; use crate::types::GetAffiliatedKeywords; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/export_snippet.rs b/src/wasm/export_snippet.rs index ad0e6759..12efa2e2 100644 --- a/src/wasm/export_snippet.rs +++ b/src/wasm/export_snippet.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::ExportSnippet; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/fixed_width_area.rs b/src/wasm/fixed_width_area.rs index 049ae4e1..436a6413 100644 --- a/src/wasm/fixed_width_area.rs +++ b/src/wasm/fixed_width_area.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::FixedWidthArea; use crate::types::GetAffiliatedKeywords; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/footnote_definition.rs b/src/wasm/footnote_definition.rs index 88a1a5c9..19a752d4 100644 --- a/src/wasm/footnote_definition.rs +++ b/src/wasm/footnote_definition.rs @@ -6,7 +6,7 @@ use super::headline::Noop; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::FootnoteDefinition; use crate::types::GetAffiliatedKeywords; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/footnote_reference.rs b/src/wasm/footnote_reference.rs index 8b1b2fae..b90a9f79 100644 --- a/src/wasm/footnote_reference.rs +++ b/src/wasm/footnote_reference.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::FootnoteReference; use crate::types::FootnoteReferenceType; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/headline.rs b/src/wasm/headline.rs index 237019c2..5413a1d0 100644 --- a/src/wasm/headline.rs +++ b/src/wasm/headline.rs @@ -6,7 +6,7 @@ use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; use super::AdditionalPropertyValue; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Heading; use crate::types::HeadlineLevel; use crate::types::PriorityCookie; diff --git a/src/wasm/horizontal_rule.rs b/src/wasm/horizontal_rule.rs index ecb62e0d..da15623e 100644 --- a/src/wasm/horizontal_rule.rs +++ b/src/wasm/horizontal_rule.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::GetAffiliatedKeywords; use crate::types::HorizontalRule; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/inline_babel_call.rs b/src/wasm/inline_babel_call.rs index d038c383..8d6c92ba 100644 --- a/src/wasm/inline_babel_call.rs +++ b/src/wasm/inline_babel_call.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::InlineBabelCall; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/inline_source_block.rs b/src/wasm/inline_source_block.rs index 9b2cf80e..74ccb186 100644 --- a/src/wasm/inline_source_block.rs +++ b/src/wasm/inline_source_block.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::InlineSourceBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/italic.rs b/src/wasm/italic.rs index b5aa097a..97c6c39c 100644 --- a/src/wasm/italic.rs +++ b/src/wasm/italic.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Italic; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/keyword.rs b/src/wasm/keyword.rs index 0108059f..3db00719 100644 --- a/src/wasm/keyword.rs +++ b/src/wasm/keyword.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::GetAffiliatedKeywords; use crate::types::Keyword; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/latex_environment.rs b/src/wasm/latex_environment.rs index bda708e6..626bc9e5 100644 --- a/src/wasm/latex_environment.rs +++ b/src/wasm/latex_environment.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::GetAffiliatedKeywords; use crate::types::LatexEnvironment; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/latex_fragment.rs b/src/wasm/latex_fragment.rs index c9e22ce9..02bdb002 100644 --- a/src/wasm/latex_fragment.rs +++ b/src/wasm/latex_fragment.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::LatexFragment; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/line_break.rs b/src/wasm/line_break.rs index 02e5289f..454cb548 100644 --- a/src/wasm/line_break.rs +++ b/src/wasm/line_break.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::LineBreak; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/macros.rs b/src/wasm/macros.rs index daf13602..81ef2477 100644 --- a/src/wasm/macros.rs +++ b/src/wasm/macros.rs @@ -46,8 +46,7 @@ macro_rules! to_wasm { } } - #[cfg(feature = "wasm_test")] - impl<'s> crate::compare::ElispFact<'s> for $ostruct { + impl<'s> crate::util::elisp_fact::ElispFact<'s> for $ostruct { fn get_elisp_name<'b>(&'b self) -> std::borrow::Cow<'s, str> { let $original = self; let ret = $elispnamebody; diff --git a/src/wasm/node_property.rs b/src/wasm/node_property.rs index 92709605..38697d82 100644 --- a/src/wasm/node_property.rs +++ b/src/wasm/node_property.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::NodeProperty; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/org_macro.rs b/src/wasm/org_macro.rs index 3e6a389a..7a147a45 100644 --- a/src/wasm/org_macro.rs +++ b/src/wasm/org_macro.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::OrgMacro; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/paragraph.rs b/src/wasm/paragraph.rs index 5d253d57..13bacd16 100644 --- a/src/wasm/paragraph.rs +++ b/src/wasm/paragraph.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::GetAffiliatedKeywords; use crate::types::Paragraph; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/plain_link.rs b/src/wasm/plain_link.rs index e33acb0b..742a5d1a 100644 --- a/src/wasm/plain_link.rs +++ b/src/wasm/plain_link.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::LinkType; use crate::types::PlainLink; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/plain_list.rs b/src/wasm/plain_list.rs index d8739f19..fcb5002f 100644 --- a/src/wasm/plain_list.rs +++ b/src/wasm/plain_list.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::GetAffiliatedKeywords; use crate::types::PlainList; use crate::types::PlainListType; diff --git a/src/wasm/plain_list_item.rs b/src/wasm/plain_list_item.rs index 639cfa65..0e845efa 100644 --- a/src/wasm/plain_list_item.rs +++ b/src/wasm/plain_list_item.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::CheckboxType; use crate::types::PlainListItem; use crate::types::PlainListItemCounter; diff --git a/src/wasm/plain_text.rs b/src/wasm/plain_text.rs index 395b4102..339b2838 100644 --- a/src/wasm/plain_text.rs +++ b/src/wasm/plain_text.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::PlainText; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/planning.rs b/src/wasm/planning.rs index 03c59045..b98f6dba 100644 --- a/src/wasm/planning.rs +++ b/src/wasm/planning.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Planning; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/property_drawer.rs b/src/wasm/property_drawer.rs index 3d9f0aba..0f751797 100644 --- a/src/wasm/property_drawer.rs +++ b/src/wasm/property_drawer.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::PropertyDrawer; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/quote_block.rs b/src/wasm/quote_block.rs index 7dbad055..421b5371 100644 --- a/src/wasm/quote_block.rs +++ b/src/wasm/quote_block.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::GetAffiliatedKeywords; use crate::types::QuoteBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/radio_link.rs b/src/wasm/radio_link.rs index cec349df..904bb6c1 100644 --- a/src/wasm/radio_link.rs +++ b/src/wasm/radio_link.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::RadioLink; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/radio_target.rs b/src/wasm/radio_target.rs index ab772051..987b8caa 100644 --- a/src/wasm/radio_target.rs +++ b/src/wasm/radio_target.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::RadioTarget; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/regular_link.rs b/src/wasm/regular_link.rs index a707c850..792a8f8e 100644 --- a/src/wasm/regular_link.rs +++ b/src/wasm/regular_link.rs @@ -6,7 +6,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::LinkType; use crate::types::RegularLink; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/section.rs b/src/wasm/section.rs index c4a7bd18..fce4c345 100644 --- a/src/wasm/section.rs +++ b/src/wasm/section.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Section; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/special_block.rs b/src/wasm/special_block.rs index 6455885e..4148d5e5 100644 --- a/src/wasm/special_block.rs +++ b/src/wasm/special_block.rs @@ -6,7 +6,7 @@ use super::headline::Noop; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::GetAffiliatedKeywords; use crate::types::SpecialBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/src_block.rs b/src/wasm/src_block.rs index 6dad15f0..fc8563f4 100644 --- a/src/wasm/src_block.rs +++ b/src/wasm/src_block.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::CharOffsetInLine; use crate::types::GetAffiliatedKeywords; use crate::types::LineNumber; diff --git a/src/wasm/statistics_cookie.rs b/src/wasm/statistics_cookie.rs index 9e9fb8d5..d782dfae 100644 --- a/src/wasm/statistics_cookie.rs +++ b/src/wasm/statistics_cookie.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::StatisticsCookie; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/strike_through.rs b/src/wasm/strike_through.rs index 2776ee91..3d69e665 100644 --- a/src/wasm/strike_through.rs +++ b/src/wasm/strike_through.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::StrikeThrough; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/subscript.rs b/src/wasm/subscript.rs index 305d5012..8ac83921 100644 --- a/src/wasm/subscript.rs +++ b/src/wasm/subscript.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Subscript; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/superscript.rs b/src/wasm/superscript.rs index 9f65ede2..ad1ac846 100644 --- a/src/wasm/superscript.rs +++ b/src/wasm/superscript.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Superscript; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/table.rs b/src/wasm/table.rs index 34b8b048..3c1ef32d 100644 --- a/src/wasm/table.rs +++ b/src/wasm/table.rs @@ -7,7 +7,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::GetAffiliatedKeywords; use crate::types::Table; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/table_cell.rs b/src/wasm/table_cell.rs index b2ce37a9..649a542e 100644 --- a/src/wasm/table_cell.rs +++ b/src/wasm/table_cell.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::TableCell; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/table_row.rs b/src/wasm/table_row.rs index 5ae71703..184a2977 100644 --- a/src/wasm/table_row.rs +++ b/src/wasm/table_row.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::TableRow; use crate::types::TableRowType; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/target.rs b/src/wasm/target.rs index 26c5b9fd..c9e59379 100644 --- a/src/wasm/target.rs +++ b/src/wasm/target.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Target; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/timestamp.rs b/src/wasm/timestamp.rs index a6c376bb..72553280 100644 --- a/src/wasm/timestamp.rs +++ b/src/wasm/timestamp.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::DayOfMonthInner; use crate::types::HourInner; use crate::types::MinuteInner; diff --git a/src/wasm/underline.rs b/src/wasm/underline.rs index 530693aa..da5ae0dc 100644 --- a/src/wasm/underline.rs +++ b/src/wasm/underline.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Underline; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/verbatim.rs b/src/wasm/verbatim.rs index bdb136d3..558920fa 100644 --- a/src/wasm/verbatim.rs +++ b/src/wasm/verbatim.rs @@ -4,7 +4,7 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::Verbatim; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm/verse_block.rs b/src/wasm/verse_block.rs index 4c244c46..585df0ea 100644 --- a/src/wasm/verse_block.rs +++ b/src/wasm/verse_block.rs @@ -5,7 +5,7 @@ use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; use super::AdditionalProperties; -use crate::compare::ElispFact; +use crate::util::elisp_fact::ElispFact; use crate::types::GetAffiliatedKeywords; use crate::types::VerseBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; diff --git a/src/wasm_test/diff.rs b/src/wasm_test/diff.rs index 04c67b0b..f6b1dfa6 100644 --- a/src/wasm_test/diff.rs +++ b/src/wasm_test/diff.rs @@ -1,7 +1,7 @@ use std::borrow::Cow; -use crate::util::foreground_color; -use crate::util::reset_color; +use crate::util::terminal::foreground_color; +use crate::util::terminal::reset_color; #[derive(Debug)] pub struct WasmDiffResult<'s> { diff --git a/src/wasm_test/runner.rs b/src/wasm_test/runner.rs index 054137b8..281845c5 100644 --- a/src/wasm_test/runner.rs +++ b/src/wasm_test/runner.rs @@ -6,11 +6,11 @@ use crate::context::GlobalSettings; use crate::parser::parse_file_with_settings; use crate::parser::parse_with_settings; use crate::settings::LocalFileAccessInterface; -use crate::util::emacs_parse_anonymous_org_document; -use crate::util::emacs_parse_file_org_document; -use crate::util::foreground_color; -use crate::util::print_versions; -use crate::util::reset_color; +use crate::util::cli::emacs_parse_anonymous_org_document; +use crate::util::cli::emacs_parse_file_org_document; +use crate::util::cli::print_versions; +use crate::util::terminal::foreground_color; +use crate::util::terminal::reset_color; use crate::wasm::ToWasm; use crate::wasm::ToWasmContext;