Skip to content

Commit ed278db

Browse files
committed
add cargo workspace to root, remove extension-module flag from PyO3 dep (see m-ou-se/inline-python#27)
1 parent 69f06c7 commit ed278db

File tree

8 files changed

+892
-2057
lines changed

8 files changed

+892
-2057
lines changed

bindings/python/Cargo.lock renamed to Cargo.lock

Lines changed: 881 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[workspace]
2+
3+
members = [
4+
"nnsplit",
5+
"bindings/javascript",
6+
"bindings/python"
7+
]

bindings/javascript/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
/target
21
**/*.rs.bk
3-
Cargo.lock
42
bin/
53
pkg/
64
wasm-pack.log

bindings/javascript/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use nnsplit as core;
1111
static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
1212

1313
#[wasm_bindgen(inspectable)]
14-
struct Split {
14+
pub struct Split {
1515
text: String,
1616
parts: Vec<JsValue>,
1717
}
@@ -55,7 +55,7 @@ impl<'a> From<core::Split<'a>> for Split {
5555
}
5656

5757
#[wasm_bindgen]
58-
struct NNSplit {
58+
pub struct NNSplit {
5959
inner: core::NNSplit,
6060
}
6161

bindings/python/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ crate-type = ["cdylib"]
1111
[dependencies]
1212
ndarray = "0.13"
1313
numpy = "0.8"
14+
pyo3 = "0.9.2"
1415

1516
[dependencies.nnsplit]
1617
path = "../../nnsplit"
1718
default-features = false
1819
features = ["model-loader"]
19-
20-
[dependencies.pyo3]
21-
version = "0.9.2"
22-
features = ["extension-module"]

bindings/python/rust-toolchain

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)