mv pylib to root

youknowone · youknowone · commit 7b0fe1d4190b · 2022-09-02T23:44:59.000+09:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
 resolver = "2"
 members = [
     "compiler", "compiler/ast", "compiler/core", "compiler/codegen", "compiler/parser",
-    ".", "common", "derive", "jit", "vm", "vm/pylib-crate", "stdlib", "wasm/lib",
+    ".", "common", "derive", "jit", "vm", "pylib", "stdlib", "wasm/lib",
 ]
 
 [features]
diff --git a/pylib/Cargo.toml b/pylib/Cargo.toml
@@ -12,8 +12,8 @@ include = ["Cargo.toml", "src/**/*.rs", "Lib/", "!Lib/**/test/", "!Lib/**/*.pyc"
 freeze-stdlib = []
 
 [dependencies]
-rustpython-compiler-core = { version = "0.1.2", path = "../../compiler/core" }
-rustpython-derive = { version = "0.1.2", path = "../../derive" }
+rustpython-compiler-core = { version = "0.1.2", path = "../compiler/core" }
+rustpython-derive = { version = "0.1.2", path = "../derive" }
 
 [build-dependencies]
 glob = "0.3"
diff --git a/pylib/build.rs b/pylib/build.rs
diff --git a/pylib/src/lib.rs b/pylib/src/lib.rs
@@ -13,20 +13,20 @@ use rustpython_compiler_core::FrozenModule;
 
 pub fn frozen_builtins() -> impl Iterator<Item = (String, FrozenModule)> {
     rustpython_derive::py_freeze!(
-        dir = "../Lib/python_builtins",
+        dir = "../vm/Lib/python_builtins",
         crate_name = "rustpython_compiler_core"
     )
 }
 
 #[cfg(not(feature = "freeze-stdlib"))]
 pub fn frozen_core() -> impl Iterator<Item = (String, FrozenModule)> {
     rustpython_derive::py_freeze!(
-        dir = "../Lib/core_modules",
+        dir = "../vm/Lib/core_modules",
         crate_name = "rustpython_compiler_core"
     )
 }
 
 #[cfg(feature = "freeze-stdlib")]
 pub fn frozen_stdlib() -> impl Iterator<Item = (String, FrozenModule)> {
-    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/vm/Cargo.toml b/vm/Cargo.toml
@@ -31,7 +31,7 @@ rustpython-compiler-core = { path = "../compiler/core", version = "0.1.2" }
 rustpython-common = { path = "../common" }
 rustpython-derive = { path = "../derive", version = "0.1.2" }
 rustpython-jit = { path = "../jit", optional = true, version = "0.1.2" }
-rustpython-pylib = { path = "pylib-crate", version = "0.1.0" }
+rustpython-pylib = { path = "../pylib", version = "0.1.0" }
 
 num-complex = { version = "0.4.0", features = ["serde"] }
 num-bigint = { version = "0.4.3", features = ["serde"] }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ include = ["LICENSE", "Cargo.toml", "src/*/.rs"]`
`15`	`15`	`resolver = "2"`
`16`	`16`	`members = [`
`17`	`17`	`"compiler", "compiler/ast", "compiler/core", "compiler/codegen", "compiler/parser",`
`18`		`- ".", "common", "derive", "jit", "vm", "vm/pylib-crate", "stdlib", "wasm/lib",`
	`18`	`+ ".", "common", "derive", "jit", "vm", "pylib", "stdlib", "wasm/lib",`
`19`	`19`	`]`
`20`	`20`
`21`	`21`	`[features]`
Original file line number	Diff line number	Diff line change
`@@ -13,20 +13,20 @@ use rustpython_compiler_core::FrozenModule;`
`13`	`13`
`14`	`14`	`pub fn frozen_builtins() -> impl Iterator<Item = (String, FrozenModule)> {`
`15`	`15`	`rustpython_derive::py_freeze!(`
`16`		`- dir = "../Lib/python_builtins",`
	`16`	`+ dir = "../vm/Lib/python_builtins",`
`17`	`17`	`crate_name = "rustpython_compiler_core"`
`18`	`18`	`)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`#[cfg(not(feature = "freeze-stdlib"))]`
`22`	`22`	`pub fn frozen_core() -> impl Iterator<Item = (String, FrozenModule)> {`
`23`	`23`	`rustpython_derive::py_freeze!(`
`24`		`- dir = "../Lib/core_modules",`
	`24`	`+ dir = "../vm/Lib/core_modules",`
`25`	`25`	`crate_name = "rustpython_compiler_core"`
`26`	`26`	`)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`#[cfg(feature = "freeze-stdlib")]`
`30`	`30`	`pub fn frozen_stdlib() -> impl Iterator<Item = (String, FrozenModule)> {`
`31`		`- rustpython_derive::py_freeze!(dir = "../../Lib", crate_name = "rustpython_compiler_core")`
	`31`	`+ rustpython_derive::py_freeze!(dir = "../Lib", crate_name = "rustpython_compiler_core")`
`32`	`32`	`}`