diff --git a/src/import/analyzer.rs b/crates/improvise-io/src/import/analyzer.rs similarity index 100% rename from src/import/analyzer.rs rename to crates/improvise-io/src/import/analyzer.rs diff --git a/src/import/csv_parser.rs b/crates/improvise-io/src/import/csv_parser.rs similarity index 100% rename from src/import/csv_parser.rs rename to crates/improvise-io/src/import/csv_parser.rs diff --git a/src/import/mod.rs b/crates/improvise-io/src/import/mod.rs similarity index 100% rename from src/import/mod.rs rename to crates/improvise-io/src/import/mod.rs diff --git a/src/import/wizard.rs b/crates/improvise-io/src/import/wizard.rs similarity index 100% rename from src/import/wizard.rs rename to crates/improvise-io/src/import/wizard.rs diff --git a/crates/improvise-io/src/lib.rs b/crates/improvise-io/src/lib.rs index 9bdd4fb..4547ce5 100644 --- a/crates/improvise-io/src/lib.rs +++ b/crates/improvise-io/src/lib.rs @@ -9,7 +9,8 @@ //! Re-exports the core modules under their conventional names so code in //! this crate can keep using `crate::model::*`, `crate::view::*`, //! `crate::workbook::*`, `crate::format::*`, and `crate::formula::*` paths. -//! -//! Scaffolded empty in this commit; the modules land in the next commit. pub use improvise_core::{format, model, view, workbook}; pub use improvise_formula as formula; + +pub mod import; +pub mod persistence; diff --git a/src/persistence/improv.pest b/crates/improvise-io/src/persistence/improv.pest similarity index 100% rename from src/persistence/improv.pest rename to crates/improvise-io/src/persistence/improv.pest diff --git a/src/persistence/mod.rs b/crates/improvise-io/src/persistence/mod.rs similarity index 100% rename from src/persistence/mod.rs rename to crates/improvise-io/src/persistence/mod.rs diff --git a/examples/gen-grammar.rs b/examples/gen-grammar.rs index 56a2a6e..9e980f5 100644 --- a/examples/gen-grammar.rs +++ b/examples/gen-grammar.rs @@ -21,7 +21,8 @@ use pest_meta::ast::{Expr, RuleType}; use pest_meta::parser; use std::collections::HashMap; -const GRAMMAR: &str = include_str!("../src/persistence/improv.pest"); +const GRAMMAR: &str = + include_str!("../crates/improvise-io/src/persistence/improv.pest"); fn load_grammar() -> HashMap { let pairs = parser::parse(parser::Rule::grammar_rules, GRAMMAR) diff --git a/src/lib.rs b/src/lib.rs index 642b696..ae50bf2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,9 +2,9 @@ pub mod command; pub mod draw; pub use improvise_core::format; pub use improvise_formula as formula; -pub mod import; +pub use improvise_io::import; pub use improvise_core::model; -pub mod persistence; +pub use improvise_io::persistence; pub mod ui; pub use improvise_core::view; pub use improvise_core::workbook;