diff --git a/Cargo.lock b/Cargo.lock index 463c0c2b6..c113248b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -703,9 +703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", - "humantime", "log", - "regex", "termcolor", ] @@ -915,12 +913,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296f72d53a89096cbc9a88c9547ee8dfe793388674620e2207593d370550ac" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "indexmap" version = "1.6.2" @@ -2069,7 +2061,6 @@ dependencies = [ "puruspe", "rand 0.8.3", "rand_core 0.6.2", - "regex", "result-like", "rustc_version_runtime", "rustpython-ast", diff --git a/Cargo.toml b/Cargo.toml index 36ab0ded9..a6ca39e48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,7 @@ license = "MIT" include = ["LICENSE", "Cargo.toml", "src/**/*.rs"] [workspace] +resolver = "2" members = [ ".", "ast", "bytecode", "common", "compiler", "compiler/porcelain", "derive", "jit", "parser", "vm", "vm/pylib-crate", "wasm/lib", @@ -26,7 +27,7 @@ ssl = ["rustpython-vm/ssl"] [dependencies] log = "0.4" -env_logger = "0.8.3" +env_logger = { version = "0.8", default-features = false, features = ["atty", "termcolor"] } clap = "2.33" rustpython-compiler = { path = "compiler/porcelain", version = "0.1.1" } rustpython-parser = { path = "parser", version = "0.1.1" } diff --git a/vm/Cargo.toml b/vm/Cargo.toml index f0a385073..e1ff9a6a4 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -52,7 +52,6 @@ rustpython-bytecode = { path = "../bytecode", version = "0.1.2" } rustpython-jit = { path = "../jit", optional = true, version = "0.1.2" } rustpython-pylib = { path = "pylib-crate", optional = true, version = "0.1.0" } serde = { version = "1.0.66", features = ["derive"] } -regex = "1" rustc_version_runtime = "0.2.0" puruspe = "0.1" caseless = "0.2.1" diff --git a/vm/src/stdlib/mod.rs b/vm/src/stdlib/mod.rs index ca0d5851b..fccbc49df 100644 --- a/vm/src/stdlib/mod.rs +++ b/vm/src/stdlib/mod.rs @@ -26,7 +26,8 @@ mod operator; mod platform; pub(crate) mod pystruct; mod random; -mod re; +// TODO: maybe make this an extension module, if we ever get those +// mod re; #[cfg(not(target_arch = "wasm32"))] pub mod socket; mod sre; @@ -113,7 +114,6 @@ pub fn get_module_inits() -> StdlibMap { "math" => math::make_module, "_operator" => operator::make_module, "_platform" => platform::make_module, - "regex_crate" => re::make_module, "_random" => random::make_module, "_sre" => sre::make_module, "_string" => string::make_module,