add cargo workspace to root, remove extension-module flag from PyO3 d…

…ep (see m-ou-se/inline-python#27)
segment-any-text · May 5, 2020 · ed278db · ed278db
1 parent 69f06c7
commit ed278db
Show file tree

Hide file tree

Showing 8 changed files with 892 additions and 2,057 deletions.
diff --git a/bindings/python/Cargo.lock → Cargo.lock b/bindings/python/Cargo.lock → Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,7 @@
+[workspace]
+
+members = [
+    "nnsplit",
+    "bindings/javascript",
+    "bindings/python"
+]
diff --git a/bindings/javascript/.gitignore b/bindings/javascript/.gitignore
@@ -1,6 +1,4 @@
-/target
 **/*.rs.bk
-Cargo.lock
 bin/
 pkg/
 wasm-pack.log

diff --git a/bindings/javascript/src/lib.rs b/bindings/javascript/src/lib.rs
@@ -11,7 +11,7 @@ use nnsplit as core;
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 #[wasm_bindgen(inspectable)]
-struct Split {
+pub struct Split {
     text: String,
     parts: Vec<JsValue>,
 }
@@ -55,7 +55,7 @@ impl<'a> From<core::Split<'a>> for Split {
 }
 
 #[wasm_bindgen]
-struct NNSplit {
+pub struct NNSplit {
     inner: core::NNSplit,
 }
 

diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml
@@ -11,12 +11,9 @@ crate-type = ["cdylib"]
 [dependencies]
 ndarray = "0.13"
 numpy = "0.8"
+pyo3 = "0.9.2"
 
 [dependencies.nnsplit]
 path = "../../nnsplit"
 default-features =  false
 features = ["model-loader"]
-
-[dependencies.pyo3]
-version = "0.9.2"
-features = ["extension-module"]
diff --git a/bindings/python/rust-toolchain b/bindings/python/rust-toolchain