From 55ad136283e3fe12c178d5d885404a4c662222d9 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Wed, 27 Dec 2023 08:49:34 -0500 Subject: [PATCH] Fix imports for wasm. --- src/bin_wasm.rs | 5 +---- src/lib.rs | 2 ++ src/wasm/mod.rs | 4 ++-- src/wasm/parse_result.rs | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/bin_wasm.rs b/src/bin_wasm.rs index 01b5622c..0791ccaf 100644 --- a/src/bin_wasm.rs +++ b/src/bin_wasm.rs @@ -1,9 +1,6 @@ -use wasm::wasm_parse_org; +use organic::wasm::wasm_parse_org; use wasm_bindgen::prelude::wasm_bindgen; -mod error; -mod wasm; - #[wasm_bindgen] pub fn parse_org(org_contents: &str) -> wasm_bindgen::JsValue { let rust_parsed = wasm_parse_org(org_contents); diff --git a/src/lib.rs b/src/lib.rs index 38c5d11a..621dc601 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,6 +12,8 @@ extern crate test; pub mod compare; #[cfg(any(feature = "compare", feature = "wasm_test"))] pub mod util; +#[cfg(any(feature = "wasm", feature = "wasm_test"))] +pub mod wasm; #[cfg(feature = "wasm_test")] pub mod wasm_test; diff --git a/src/wasm/mod.rs b/src/wasm/mod.rs index 8c222276..246fbc21 100644 --- a/src/wasm/mod.rs +++ b/src/wasm/mod.rs @@ -62,7 +62,7 @@ mod underline; mod verbatim; mod verse_block; -pub(crate) use parse_result::wasm_parse_org; -pub(crate) use parse_result::ParseResult; +pub use parse_result::wasm_parse_org; +pub use parse_result::ParseResult; pub(crate) use to_wasm::ToWasm; pub(crate) use to_wasm::ToWasmContext; diff --git a/src/wasm/parse_result.rs b/src/wasm/parse_result.rs index ea4ffe13..afe5e835 100644 --- a/src/wasm/parse_result.rs +++ b/src/wasm/parse_result.rs @@ -8,7 +8,7 @@ use crate::settings::GlobalSettings; #[derive(Debug, Serialize)] #[serde(tag = "status", content = "content")] -pub(crate) enum ParseResult<'s> { +pub enum ParseResult<'s> { #[serde(rename = "success")] Success(WasmDocument<'s>), @@ -16,7 +16,7 @@ pub(crate) enum ParseResult<'s> { Error(String), } -pub(crate) fn wasm_parse_org(org_contents: &str) -> ParseResult<'_> { +pub fn wasm_parse_org(org_contents: &str) -> ParseResult<'_> { let global_settings = GlobalSettings::default(); let to_wasm_context = ToWasmContext::new(org_contents); let rust_parsed = match parse_with_settings(org_contents, &global_settings)