Merge pull request RustPython#3754 from youknowone/cargo

youknowone · web-flow · commit 3379ea2d781f · 2022-06-03T10:56:42.000+09:00
add stdlib to rustpython_wasm and remove threading from vm default
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ stdlib = ["rustpython-stdlib"]
 flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"]
 freeze-stdlib = ["rustpython-vm/freeze-stdlib"]
 jit = ["rustpython-vm/jit"]
-threading = ["rustpython-vm/threading"]
+threading = ["rustpython-vm/threading", "rustpython-stdlib/threading"]
 pylib = ["rustpython-vm/pylib"]
 zlib = ["stdlib", "rustpython-stdlib/zlib"]
 ssl = ["rustpython-stdlib/ssl"]
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -71,7 +71,7 @@ termios = "0.3.3"
 default = ["compile-parse", "pylib"]
 pylib = ["rustpython-vm/pylib"]
 compile-parse = ["rustpython-vm/compile-parse", "rustpython-parser"]
-threading = ["rustpython-vm/threading"]
+threading = ["rustpython-common/threading", "rustpython-vm/threading"]
 parser = ["rustpython-vm/parser"]
 ast = ["rustpython-vm/ast"]
 compiler = ["rustpython-vm/compiler"]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 include = ["src/**/*.rs", "Cargo.toml", "build.rs", "Lib/**/*.py"]
 
 [features]
-default = ["compile-parse", "threading", "pylib"]
+default = ["compile-parse", "pylib"]
 vm-tracing-logging = []
 flame-it = ["flame", "flamer"]
 pylib = ["rustpython-pylib"]
diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
@@ -11,15 +11,16 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [features]
-default = ["freeze-stdlib"]
+default = ["freeze-stdlib", "rustpython-stdlib"]
 freeze-stdlib = ["rustpython-vm/freeze-stdlib"]
 no-start-func = []
 
 [dependencies]
 rustpython-parser = { path = "../../parser" }
 rustpython-common = { path = "../../common" }
-# no threading feature for rustpython-vm -- doesn't much matter anyway, but it might be more optimized
+# make sure no threading! otherwise wasm build will fail
 rustpython-vm = { path = "../../vm", default-features = false, features = ["compile-parse"]  }
+rustpython-stdlib = { path = "../../stdlib", default-features = false, features = ["compile-parse"], optional = true }
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 serde-wasm-bindgen = "0.3.1"
