From 77eca427609c221aa19785c8ac5586959941608e Mon Sep 17 00:00:00 2001 From: PoiScript Date: Fri, 13 Sep 2019 21:21:21 +0800 Subject: [PATCH] chore: setup Cargo workspace --- .gitignore | 2 +- .travis.yml | 2 +- Cargo.toml | 41 ++----------------- orgize/Cargo.toml | 37 +++++++++++++++++ orgize/README.md | 1 + {benches => orgize/benches}/parse.rs | 0 {examples => orgize/examples}/custom.rs | 0 {examples => orgize/examples}/iter.rs | 0 {examples => orgize/examples}/json.rs | 0 {examples => orgize/examples}/syntect.rs | 0 {fuzz => orgize/fuzz}/.gitignore | 0 {fuzz => orgize/fuzz}/Cargo.toml | 0 .../fuzz}/fuzz_targets/fuzz_target_1.rs | 0 {src => orgize/src}/config.rs | 0 {src => orgize/src}/elements/block.rs | 0 {src => orgize/src}/elements/clock.rs | 0 {src => orgize/src}/elements/cookie.rs | 0 {src => orgize/src}/elements/drawer.rs | 0 {src => orgize/src}/elements/dyn_block.rs | 0 {src => orgize/src}/elements/emphasis.rs | 0 {src => orgize/src}/elements/fn_def.rs | 0 {src => orgize/src}/elements/fn_ref.rs | 0 {src => orgize/src}/elements/inline_call.rs | 0 {src => orgize/src}/elements/inline_src.rs | 0 {src => orgize/src}/elements/keyword.rs | 0 {src => orgize/src}/elements/link.rs | 0 {src => orgize/src}/elements/list.rs | 0 {src => orgize/src}/elements/macros.rs | 0 {src => orgize/src}/elements/mod.rs | 0 {src => orgize/src}/elements/planning.rs | 0 {src => orgize/src}/elements/radio_target.rs | 0 {src => orgize/src}/elements/rule.rs | 0 {src => orgize/src}/elements/snippet.rs | 0 {src => orgize/src}/elements/table.rs | 0 {src => orgize/src}/elements/target.rs | 0 {src => orgize/src}/elements/timestamp.rs | 0 {src => orgize/src}/elements/title.rs | 0 {src => orgize/src}/error.rs | 2 +- {src => orgize/src}/export/html.rs | 0 {src => orgize/src}/export/mod.rs | 0 {src => orgize/src}/export/org.rs | 0 {src => orgize/src}/lib.rs | 0 {src => orgize/src}/node.rs | 0 {src => orgize/src}/org.rs | 0 {src => orgize/src}/parsers.rs | 0 {tests => orgize/tests}/node.rs | 0 {tests => orgize/tests}/parse.rs | 0 47 files changed, 45 insertions(+), 40 deletions(-) create mode 100644 orgize/Cargo.toml create mode 120000 orgize/README.md rename {benches => orgize/benches}/parse.rs (100%) rename {examples => orgize/examples}/custom.rs (100%) rename {examples => orgize/examples}/iter.rs (100%) rename {examples => orgize/examples}/json.rs (100%) rename {examples => orgize/examples}/syntect.rs (100%) rename {fuzz => orgize/fuzz}/.gitignore (100%) rename {fuzz => orgize/fuzz}/Cargo.toml (100%) rename {fuzz => orgize/fuzz}/fuzz_targets/fuzz_target_1.rs (100%) rename {src => orgize/src}/config.rs (100%) rename {src => orgize/src}/elements/block.rs (100%) rename {src => orgize/src}/elements/clock.rs (100%) rename {src => orgize/src}/elements/cookie.rs (100%) rename {src => orgize/src}/elements/drawer.rs (100%) rename {src => orgize/src}/elements/dyn_block.rs (100%) rename {src => orgize/src}/elements/emphasis.rs (100%) rename {src => orgize/src}/elements/fn_def.rs (100%) rename {src => orgize/src}/elements/fn_ref.rs (100%) rename {src => orgize/src}/elements/inline_call.rs (100%) rename {src => orgize/src}/elements/inline_src.rs (100%) rename {src => orgize/src}/elements/keyword.rs (100%) rename {src => orgize/src}/elements/link.rs (100%) rename {src => orgize/src}/elements/list.rs (100%) rename {src => orgize/src}/elements/macros.rs (100%) rename {src => orgize/src}/elements/mod.rs (100%) rename {src => orgize/src}/elements/planning.rs (100%) rename {src => orgize/src}/elements/radio_target.rs (100%) rename {src => orgize/src}/elements/rule.rs (100%) rename {src => orgize/src}/elements/snippet.rs (100%) rename {src => orgize/src}/elements/table.rs (100%) rename {src => orgize/src}/elements/target.rs (100%) rename {src => orgize/src}/elements/timestamp.rs (100%) rename {src => orgize/src}/elements/title.rs (100%) rename {src => orgize/src}/error.rs (99%) rename {src => orgize/src}/export/html.rs (100%) rename {src => orgize/src}/export/mod.rs (100%) rename {src => orgize/src}/export/org.rs (100%) rename {src => orgize/src}/lib.rs (100%) rename {src => orgize/src}/node.rs (100%) rename {src => orgize/src}/org.rs (100%) rename {src => orgize/src}/parsers.rs (100%) rename {tests => orgize/tests}/node.rs (100%) rename {tests => orgize/tests}/parse.rs (100%) diff --git a/.gitignore b/.gitignore index 4ca2515..859c83c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ **/*.rs.bk Cargo.lock -benches/*.org +orgize/benches/*.org .gdb_history perf.data* diff --git a/.travis.yml b/.travis.yml index ce8bb06..1b2737f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_script: script: - cargo fmt --all -- --check - - cargo test + - cargo test --all notifications: email: diff --git a/Cargo.toml b/Cargo.toml index 38034a2..06faa09 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,37 +1,4 @@ -[package] -name = "orgize" -version = "0.3.1" -authors = ["PoiScript "] -description = "A Rust library for parsing orgmode files." -repository = "https://github.com/PoiScript/orgize" -readme = "README.md" -edition = "2018" -license = "MIT" -keywords = ["orgmode", "emacs", "parser"] - -[package.metadata.docs.rs] -all-features = true - -[badges] -travis-ci = { repository = "PoiScript/orgize" } - -[features] -default = ["ser"] -ser = ["serde", "serde_indextree"] - -[dependencies] -bytecount = "0.6.0" -chrono = { version = "0.4.9", optional = true } -indextree = "4.0.0" -jetscii = "0.4.4" -memchr = "2.2.1" -nom = "5.0.1" -serde = { version = "1.0.100", optional = true, features = ["derive"] } -serde_indextree = { version = "0.2.0", optional = true } - -[dev-dependencies] -lazy_static = "1.4.0" -pretty_assertions = "0.6.1" -serde_json = "1.0.40" -slugify = "0.1.0" -syntect = "3.2.1" +[workspace] +members = [ + "orgize", +] diff --git a/orgize/Cargo.toml b/orgize/Cargo.toml new file mode 100644 index 0000000..38034a2 --- /dev/null +++ b/orgize/Cargo.toml @@ -0,0 +1,37 @@ +[package] +name = "orgize" +version = "0.3.1" +authors = ["PoiScript "] +description = "A Rust library for parsing orgmode files." +repository = "https://github.com/PoiScript/orgize" +readme = "README.md" +edition = "2018" +license = "MIT" +keywords = ["orgmode", "emacs", "parser"] + +[package.metadata.docs.rs] +all-features = true + +[badges] +travis-ci = { repository = "PoiScript/orgize" } + +[features] +default = ["ser"] +ser = ["serde", "serde_indextree"] + +[dependencies] +bytecount = "0.6.0" +chrono = { version = "0.4.9", optional = true } +indextree = "4.0.0" +jetscii = "0.4.4" +memchr = "2.2.1" +nom = "5.0.1" +serde = { version = "1.0.100", optional = true, features = ["derive"] } +serde_indextree = { version = "0.2.0", optional = true } + +[dev-dependencies] +lazy_static = "1.4.0" +pretty_assertions = "0.6.1" +serde_json = "1.0.40" +slugify = "0.1.0" +syntect = "3.2.1" diff --git a/orgize/README.md b/orgize/README.md new file mode 120000 index 0000000..32d46ee --- /dev/null +++ b/orgize/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file diff --git a/benches/parse.rs b/orgize/benches/parse.rs similarity index 100% rename from benches/parse.rs rename to orgize/benches/parse.rs diff --git a/examples/custom.rs b/orgize/examples/custom.rs similarity index 100% rename from examples/custom.rs rename to orgize/examples/custom.rs diff --git a/examples/iter.rs b/orgize/examples/iter.rs similarity index 100% rename from examples/iter.rs rename to orgize/examples/iter.rs diff --git a/examples/json.rs b/orgize/examples/json.rs similarity index 100% rename from examples/json.rs rename to orgize/examples/json.rs diff --git a/examples/syntect.rs b/orgize/examples/syntect.rs similarity index 100% rename from examples/syntect.rs rename to orgize/examples/syntect.rs diff --git a/fuzz/.gitignore b/orgize/fuzz/.gitignore similarity index 100% rename from fuzz/.gitignore rename to orgize/fuzz/.gitignore diff --git a/fuzz/Cargo.toml b/orgize/fuzz/Cargo.toml similarity index 100% rename from fuzz/Cargo.toml rename to orgize/fuzz/Cargo.toml diff --git a/fuzz/fuzz_targets/fuzz_target_1.rs b/orgize/fuzz/fuzz_targets/fuzz_target_1.rs similarity index 100% rename from fuzz/fuzz_targets/fuzz_target_1.rs rename to orgize/fuzz/fuzz_targets/fuzz_target_1.rs diff --git a/src/config.rs b/orgize/src/config.rs similarity index 100% rename from src/config.rs rename to orgize/src/config.rs diff --git a/src/elements/block.rs b/orgize/src/elements/block.rs similarity index 100% rename from src/elements/block.rs rename to orgize/src/elements/block.rs diff --git a/src/elements/clock.rs b/orgize/src/elements/clock.rs similarity index 100% rename from src/elements/clock.rs rename to orgize/src/elements/clock.rs diff --git a/src/elements/cookie.rs b/orgize/src/elements/cookie.rs similarity index 100% rename from src/elements/cookie.rs rename to orgize/src/elements/cookie.rs diff --git a/src/elements/drawer.rs b/orgize/src/elements/drawer.rs similarity index 100% rename from src/elements/drawer.rs rename to orgize/src/elements/drawer.rs diff --git a/src/elements/dyn_block.rs b/orgize/src/elements/dyn_block.rs similarity index 100% rename from src/elements/dyn_block.rs rename to orgize/src/elements/dyn_block.rs diff --git a/src/elements/emphasis.rs b/orgize/src/elements/emphasis.rs similarity index 100% rename from src/elements/emphasis.rs rename to orgize/src/elements/emphasis.rs diff --git a/src/elements/fn_def.rs b/orgize/src/elements/fn_def.rs similarity index 100% rename from src/elements/fn_def.rs rename to orgize/src/elements/fn_def.rs diff --git a/src/elements/fn_ref.rs b/orgize/src/elements/fn_ref.rs similarity index 100% rename from src/elements/fn_ref.rs rename to orgize/src/elements/fn_ref.rs diff --git a/src/elements/inline_call.rs b/orgize/src/elements/inline_call.rs similarity index 100% rename from src/elements/inline_call.rs rename to orgize/src/elements/inline_call.rs diff --git a/src/elements/inline_src.rs b/orgize/src/elements/inline_src.rs similarity index 100% rename from src/elements/inline_src.rs rename to orgize/src/elements/inline_src.rs diff --git a/src/elements/keyword.rs b/orgize/src/elements/keyword.rs similarity index 100% rename from src/elements/keyword.rs rename to orgize/src/elements/keyword.rs diff --git a/src/elements/link.rs b/orgize/src/elements/link.rs similarity index 100% rename from src/elements/link.rs rename to orgize/src/elements/link.rs diff --git a/src/elements/list.rs b/orgize/src/elements/list.rs similarity index 100% rename from src/elements/list.rs rename to orgize/src/elements/list.rs diff --git a/src/elements/macros.rs b/orgize/src/elements/macros.rs similarity index 100% rename from src/elements/macros.rs rename to orgize/src/elements/macros.rs diff --git a/src/elements/mod.rs b/orgize/src/elements/mod.rs similarity index 100% rename from src/elements/mod.rs rename to orgize/src/elements/mod.rs diff --git a/src/elements/planning.rs b/orgize/src/elements/planning.rs similarity index 100% rename from src/elements/planning.rs rename to orgize/src/elements/planning.rs diff --git a/src/elements/radio_target.rs b/orgize/src/elements/radio_target.rs similarity index 100% rename from src/elements/radio_target.rs rename to orgize/src/elements/radio_target.rs diff --git a/src/elements/rule.rs b/orgize/src/elements/rule.rs similarity index 100% rename from src/elements/rule.rs rename to orgize/src/elements/rule.rs diff --git a/src/elements/snippet.rs b/orgize/src/elements/snippet.rs similarity index 100% rename from src/elements/snippet.rs rename to orgize/src/elements/snippet.rs diff --git a/src/elements/table.rs b/orgize/src/elements/table.rs similarity index 100% rename from src/elements/table.rs rename to orgize/src/elements/table.rs diff --git a/src/elements/target.rs b/orgize/src/elements/target.rs similarity index 100% rename from src/elements/target.rs rename to orgize/src/elements/target.rs diff --git a/src/elements/timestamp.rs b/orgize/src/elements/timestamp.rs similarity index 100% rename from src/elements/timestamp.rs rename to orgize/src/elements/timestamp.rs diff --git a/src/elements/title.rs b/orgize/src/elements/title.rs similarity index 100% rename from src/elements/title.rs rename to orgize/src/elements/title.rs diff --git a/src/error.rs b/orgize/src/error.rs similarity index 99% rename from src/error.rs rename to orgize/src/error.rs index ca107be..c6c062d 100644 --- a/src/error.rs +++ b/orgize/src/error.rs @@ -134,7 +134,7 @@ impl Org<'_> { } // TableCell is a container but it might // not contains anything, e.g. `||||||` - Element::TableCell => () + Element::TableCell => (), } } Ok(()) diff --git a/src/export/html.rs b/orgize/src/export/html.rs similarity index 100% rename from src/export/html.rs rename to orgize/src/export/html.rs diff --git a/src/export/mod.rs b/orgize/src/export/mod.rs similarity index 100% rename from src/export/mod.rs rename to orgize/src/export/mod.rs diff --git a/src/export/org.rs b/orgize/src/export/org.rs similarity index 100% rename from src/export/org.rs rename to orgize/src/export/org.rs diff --git a/src/lib.rs b/orgize/src/lib.rs similarity index 100% rename from src/lib.rs rename to orgize/src/lib.rs diff --git a/src/node.rs b/orgize/src/node.rs similarity index 100% rename from src/node.rs rename to orgize/src/node.rs diff --git a/src/org.rs b/orgize/src/org.rs similarity index 100% rename from src/org.rs rename to orgize/src/org.rs diff --git a/src/parsers.rs b/orgize/src/parsers.rs similarity index 100% rename from src/parsers.rs rename to orgize/src/parsers.rs diff --git a/tests/node.rs b/orgize/tests/node.rs similarity index 100% rename from tests/node.rs rename to orgize/tests/node.rs diff --git a/tests/parse.rs b/orgize/tests/parse.rs similarity index 100% rename from tests/parse.rs rename to orgize/tests/parse.rs