From 2d4a59284622c3ae9ff10d287baf7ff9fd49248f Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 21 Apr 2023 18:57:38 -0400 Subject: [PATCH] Expose the parser module instead of re-exporting all of its contents. --- build.rs | 2 +- src/compare/diff.rs | 2 +- src/lib.rs | 4 +--- src/main.rs | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build.rs b/build.rs index 0053d2ed..ea437d62 100644 --- a/build.rs +++ b/build.rs @@ -59,7 +59,7 @@ fn write_header(test_file: &mut File) { r#" #[feature(exit_status_error)] use organic::compare_document; -use organic::document; +use organic::parser::document; use organic::emacs_parse_org_document; use organic::sexp; diff --git a/src/compare/diff.rs b/src/compare/diff.rs index 11dfeb4a..c0584903 100644 --- a/src/compare/diff.rs +++ b/src/compare/diff.rs @@ -6,6 +6,7 @@ use crate::parser::CommentBlock; use crate::parser::Document; use crate::parser::DocumentElement; use crate::parser::Drawer; +use crate::parser::DynamicBlock; use crate::parser::Element; use crate::parser::ExampleBlock; use crate::parser::ExportBlock; @@ -22,7 +23,6 @@ use crate::parser::Table; use crate::parser::TableCell; use crate::parser::TableRow; use crate::parser::VerseBlock; -use crate::DynamicBlock; #[derive(Debug)] pub struct DiffResult { diff --git a/src/lib.rs b/src/lib.rs index 052e16ff..f5aac0b8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,6 +11,4 @@ pub use compare::emacs_parse_org_document; pub use compare::sexp; mod error; -mod parser; - -pub use parser::*; +pub mod parser; diff --git a/src/main.rs b/src/main.rs index f82e2634..0916f22f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,7 @@ #![feature(round_char_boundary)] use crate::init_tracing::init_telemetry; use crate::init_tracing::shutdown_telemetry; -use ::organic::document; +use ::organic::parser::document; mod init_tracing; const TEST_DOC: &'static str = include_str!("../toy_language.txt");