diff --git a/pylib/src/lib.rs b/pylib/src/lib.rs index 4ce3c8a7e..7f52aca99 100644 --- a/pylib/src/lib.rs +++ b/pylib/src/lib.rs @@ -6,10 +6,10 @@ // so build.rs sets this env var pub const LIB_PATH: &str = match option_env!("win_lib_path") { Some(s) => s, - None => concat!(env!("CARGO_MANIFEST_DIR"), "/../Lib"), + None => concat!(env!("CARGO_MANIFEST_DIR"), "/Lib"), }; #[cfg(feature = "freeze-stdlib")] pub fn frozen_stdlib() -> impl Iterator { - rustpython_derive::py_freeze!(dir = "../Lib", crate_name = "rustpython_compiler_core") + rustpython_derive::py_freeze!(dir = "./Lib", crate_name = "rustpython_compiler_core") } diff --git a/src/lib.rs b/src/lib.rs index eb7369991..44ad16bbf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -43,6 +43,8 @@ extern crate env_logger; #[macro_use] extern crate log; +use rustpython_pylib; + mod shell; use clap::{App, AppSettings, Arg, ArgMatches}; @@ -257,25 +259,24 @@ fn add_stdlib(vm: &mut VirtualMachine) { { use rustpython_vm::common::rc::PyRc; let state = PyRc::get_mut(&mut vm.state).unwrap(); + let settings = &mut state.settings; #[allow(clippy::needless_collect)] // false positive - let path_list: Vec<_> = state.settings.path_list.drain(..).collect(); + let path_list: Vec<_> = settings.path_list.drain(..).collect(); // BUILDTIME_RUSTPYTHONPATH should be set when distributing if let Some(paths) = option_env!("BUILDTIME_RUSTPYTHONPATH") { - state - .settings + settings .path_list .extend(split_paths(paths).map(|path| path.into_os_string().into_string().unwrap())) } else { #[cfg(feature = "rustpython-pylib")] - state - .settings + settings .path_list .push(rustpython_pylib::LIB_PATH.to_owned()) } - state.settings.path_list.extend(path_list.into_iter()); + settings.path_list.extend(path_list.into_iter()); } } diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml index 1145f6312..b468e3b24 100644 --- a/wasm/lib/Cargo.toml +++ b/wasm/lib/Cargo.toml @@ -11,9 +11,8 @@ edition = "2021" crate-type = ["cdylib", "rlib"] [features] -default = ["stdlib"] -stdlib = ["freeze-stdlib", "rustpython-pylib", "rustpython-stdlib"] -freeze-stdlib = ["rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"] +default = ["freeze-stdlib"] +freeze-stdlib = ["rustpython-vm/freeze-stdlib", "rustpython-pylib/freeze-stdlib", "rustpython-stdlib"] no-start-func = [] [dependencies]