drop compiler dependencies from stdlib

youknowone · youknowone · commit 86118d527637 · 2022-08-22T04:43:03.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,7 +39,7 @@ clap = "2.34"
 rustpython-compiler = { path = "compiler", version = "0.1.1" }
 rustpython-parser = { path = "compiler/parser", version = "0.1.1" }
 rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compile-parse"] }
-rustpython-stdlib = {path = "stdlib", optional = true, default-features = false, features = ["compile-parse"]}
+rustpython-stdlib = {path = "stdlib", optional = true, default-features = false}
 dirs = { package = "dirs-next", version = "2.0.0" }
 num-traits = "0.2.14"
 cfg-if = "1.0.0"
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rustpython-parser = { path = "../compiler/parser", optional = true }
 rustpython-derive = { path = "../derive" }
 rustpython-vm = { path = "../vm" }
 rustpython-common = { path = "../common" }
@@ -81,14 +80,7 @@ page_size = "0.4"
 termios = "0.3.3"
 
 [features]
-default = ["compile-parse"]
-compile-parse = ["rustpython-vm/compile-parse", "rustpython-parser"]
 threading = ["rustpython-common/threading", "rustpython-vm/threading"]
-parser = ["rustpython-vm/parser"]
-ast = ["rustpython-vm/ast"]
-compiler = ["rustpython-vm/compiler"]
-# compiler = ["rustpython-compiler", "rustpython-compiler-core", "ast"]
-# parser = ["rustpython-parser", "ast"]
 
 zlib = ["libz-sys", "flate2/zlib"]
 bz2 = ["bzip2"]
diff --git a/stdlib/src/lib.rs b/stdlib/src/lib.rs
@@ -109,11 +109,6 @@ pub fn get_module_inits() -> impl Iterator<Item = (Cow<'static, str>, StdlibInit
             "_statistics" => statistics::make_module,
             // crate::vm::sysmodule::sysconfigdata_name() => sysconfigdata::make_module,
         }
-        // parser related modules:
-        #[cfg(feature = "rustpython-ast")]
-        {
-            "_ast" => ast::make_module,
-        }
         #[cfg(any(unix, target_os = "wasi"))]
         {
             "fcntl" => fcntl::make_module,
diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
@@ -20,7 +20,7 @@ rustpython-parser = { path = "../../compiler/parser" }
 rustpython-common = { path = "../../common" }
 # make sure no threading! otherwise wasm build will fail
 rustpython-vm = { path = "../../vm", default-features = false, features = ["compile-parse", "encodings"] }
-rustpython-stdlib = { path = "../../stdlib", default-features = false, features = ["compile-parse"], optional = true }
+rustpython-stdlib = { path = "../../stdlib", default-features = false, optional = true }
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 serde-wasm-bindgen = "0.3.1"

Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,6 @@ pub fn get_module_inits() -> impl Iterator<Item = (Cow<'static, str>, StdlibInit`
`109`	`109`	`"_statistics" => statistics::make_module,`
`110`	`110`	`// crate::vm::sysmodule::sysconfigdata_name() => sysconfigdata::make_module,`
`111`	`111`	`}`
`112`		`- // parser related modules:`
`113`		`- #[cfg(feature = "rustpython-ast")]`
`114`		`- {`
`115`		`- "_ast" => ast::make_module,`
`116`		`- }`
`117`	`112`	`#[cfg(any(unix, target_os = "wasi"))]`
`118`	`113`	`{`
`119`	`114`	`"fcntl" => fcntl::make_module,`