diff --git a/Cargo.toml b/Cargo.toml index be2d7241af2..8d344c133c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -123,7 +123,6 @@ resolver = "2" members = [ ".", "derive", - "vm", "stdlib", "wasm/lib", "crates/*", @@ -146,7 +145,7 @@ rustpython-derive = { path = "derive", version = "0.4.0" } rustpython-derive-impl = { path = "crates/derive-impl", version = "0.4.0" } rustpython-jit = { path = "crates/jit", version = "0.4.0" } rustpython-literal = { path = "crates/literal", version = "0.4.0" } -rustpython-vm = { path = "vm", default-features = false, version = "0.4.0" } +rustpython-vm = { path = "crates/vm", default-features = false, version = "0.4.0" } rustpython-pylib = { path = "crates/pylib", version = "0.4.0" } rustpython-stdlib = { path = "stdlib", default-features = false, version = "0.4.0" } rustpython-sre_engine = { path = "crates/sre_engine", version = "0.4.0" } diff --git a/vm/Cargo.toml b/crates/vm/Cargo.toml similarity index 100% rename from vm/Cargo.toml rename to crates/vm/Cargo.toml diff --git a/vm/Lib/README.md b/crates/vm/Lib/README.md similarity index 100% rename from vm/Lib/README.md rename to crates/vm/Lib/README.md diff --git a/crates/vm/Lib/core_modules/codecs.py b/crates/vm/Lib/core_modules/codecs.py new file mode 120000 index 00000000000..4a96fdd182d --- /dev/null +++ b/crates/vm/Lib/core_modules/codecs.py @@ -0,0 +1 @@ +../../../../Lib/codecs.py \ No newline at end of file diff --git a/crates/vm/Lib/core_modules/copyreg.py b/crates/vm/Lib/core_modules/copyreg.py new file mode 120000 index 00000000000..6f4f0d4d445 --- /dev/null +++ b/crates/vm/Lib/core_modules/copyreg.py @@ -0,0 +1 @@ +../../../../Lib/copyreg.py \ No newline at end of file diff --git a/crates/vm/Lib/core_modules/encodings_utf_8.py b/crates/vm/Lib/core_modules/encodings_utf_8.py new file mode 120000 index 00000000000..0a82f3b4a41 --- /dev/null +++ b/crates/vm/Lib/core_modules/encodings_utf_8.py @@ -0,0 +1 @@ +../../../../Lib/encodings/utf_8.py \ No newline at end of file diff --git a/crates/vm/Lib/python_builtins/__hello__.py b/crates/vm/Lib/python_builtins/__hello__.py new file mode 120000 index 00000000000..e7dedd3d0aa --- /dev/null +++ b/crates/vm/Lib/python_builtins/__hello__.py @@ -0,0 +1 @@ +../../../../Lib/__hello__.py \ No newline at end of file diff --git a/crates/vm/Lib/python_builtins/__phello__ b/crates/vm/Lib/python_builtins/__phello__ new file mode 120000 index 00000000000..21833dd18d8 --- /dev/null +++ b/crates/vm/Lib/python_builtins/__phello__ @@ -0,0 +1 @@ +../../../../Lib/__phello__/ \ No newline at end of file diff --git a/vm/Lib/python_builtins/__reducelib.py b/crates/vm/Lib/python_builtins/__reducelib.py similarity index 100% rename from vm/Lib/python_builtins/__reducelib.py rename to crates/vm/Lib/python_builtins/__reducelib.py diff --git a/crates/vm/Lib/python_builtins/_frozen_importlib.py b/crates/vm/Lib/python_builtins/_frozen_importlib.py new file mode 120000 index 00000000000..9d752e80dec --- /dev/null +++ b/crates/vm/Lib/python_builtins/_frozen_importlib.py @@ -0,0 +1 @@ +../../../../Lib/importlib/_bootstrap.py \ No newline at end of file diff --git a/crates/vm/Lib/python_builtins/_frozen_importlib_external.py b/crates/vm/Lib/python_builtins/_frozen_importlib_external.py new file mode 120000 index 00000000000..a6b01510674 --- /dev/null +++ b/crates/vm/Lib/python_builtins/_frozen_importlib_external.py @@ -0,0 +1 @@ +../../../../Lib/importlib/_bootstrap_external.py \ No newline at end of file diff --git a/vm/Lib/python_builtins/_py_exceptiongroup.py b/crates/vm/Lib/python_builtins/_py_exceptiongroup.py similarity index 100% rename from vm/Lib/python_builtins/_py_exceptiongroup.py rename to crates/vm/Lib/python_builtins/_py_exceptiongroup.py diff --git a/crates/vm/Lib/python_builtins/_thread.py b/crates/vm/Lib/python_builtins/_thread.py new file mode 120000 index 00000000000..9079ca9fda3 --- /dev/null +++ b/crates/vm/Lib/python_builtins/_thread.py @@ -0,0 +1 @@ +../../../../Lib/_dummy_thread.py \ No newline at end of file diff --git a/vm/build.rs b/crates/vm/build.rs similarity index 96% rename from vm/build.rs rename to crates/vm/build.rs index 93d29c3a578..f76bf3f5cbd 100644 --- a/vm/build.rs +++ b/crates/vm/build.rs @@ -11,7 +11,7 @@ fn main() { let display = entry.display(); println!("cargo:rerun-if-changed={display}"); } - println!("cargo:rerun-if-changed=../Lib/importlib/_bootstrap.py"); + println!("cargo:rerun-if-changed=../../Lib/importlib/_bootstrap.py"); println!("cargo:rustc-env=RUSTPYTHON_GIT_HASH={}", git_hash()); println!( diff --git a/vm/src/anystr.rs b/crates/vm/src/anystr.rs similarity index 100% rename from vm/src/anystr.rs rename to crates/vm/src/anystr.rs diff --git a/vm/src/buffer.rs b/crates/vm/src/buffer.rs similarity index 100% rename from vm/src/buffer.rs rename to crates/vm/src/buffer.rs diff --git a/vm/src/builtins/asyncgenerator.rs b/crates/vm/src/builtins/asyncgenerator.rs similarity index 100% rename from vm/src/builtins/asyncgenerator.rs rename to crates/vm/src/builtins/asyncgenerator.rs diff --git a/vm/src/builtins/bool.rs b/crates/vm/src/builtins/bool.rs similarity index 100% rename from vm/src/builtins/bool.rs rename to crates/vm/src/builtins/bool.rs diff --git a/vm/src/builtins/builtin_func.rs b/crates/vm/src/builtins/builtin_func.rs similarity index 100% rename from vm/src/builtins/builtin_func.rs rename to crates/vm/src/builtins/builtin_func.rs diff --git a/vm/src/builtins/bytearray.rs b/crates/vm/src/builtins/bytearray.rs similarity index 100% rename from vm/src/builtins/bytearray.rs rename to crates/vm/src/builtins/bytearray.rs diff --git a/vm/src/builtins/bytes.rs b/crates/vm/src/builtins/bytes.rs similarity index 100% rename from vm/src/builtins/bytes.rs rename to crates/vm/src/builtins/bytes.rs diff --git a/vm/src/builtins/classmethod.rs b/crates/vm/src/builtins/classmethod.rs similarity index 100% rename from vm/src/builtins/classmethod.rs rename to crates/vm/src/builtins/classmethod.rs diff --git a/vm/src/builtins/code.rs b/crates/vm/src/builtins/code.rs similarity index 100% rename from vm/src/builtins/code.rs rename to crates/vm/src/builtins/code.rs diff --git a/vm/src/builtins/complex.rs b/crates/vm/src/builtins/complex.rs similarity index 100% rename from vm/src/builtins/complex.rs rename to crates/vm/src/builtins/complex.rs diff --git a/vm/src/builtins/coroutine.rs b/crates/vm/src/builtins/coroutine.rs similarity index 100% rename from vm/src/builtins/coroutine.rs rename to crates/vm/src/builtins/coroutine.rs diff --git a/vm/src/builtins/descriptor.rs b/crates/vm/src/builtins/descriptor.rs similarity index 100% rename from vm/src/builtins/descriptor.rs rename to crates/vm/src/builtins/descriptor.rs diff --git a/vm/src/builtins/dict.rs b/crates/vm/src/builtins/dict.rs similarity index 100% rename from vm/src/builtins/dict.rs rename to crates/vm/src/builtins/dict.rs diff --git a/vm/src/builtins/enumerate.rs b/crates/vm/src/builtins/enumerate.rs similarity index 100% rename from vm/src/builtins/enumerate.rs rename to crates/vm/src/builtins/enumerate.rs diff --git a/vm/src/builtins/filter.rs b/crates/vm/src/builtins/filter.rs similarity index 100% rename from vm/src/builtins/filter.rs rename to crates/vm/src/builtins/filter.rs diff --git a/vm/src/builtins/float.rs b/crates/vm/src/builtins/float.rs similarity index 100% rename from vm/src/builtins/float.rs rename to crates/vm/src/builtins/float.rs diff --git a/vm/src/builtins/frame.rs b/crates/vm/src/builtins/frame.rs similarity index 100% rename from vm/src/builtins/frame.rs rename to crates/vm/src/builtins/frame.rs diff --git a/vm/src/builtins/function.rs b/crates/vm/src/builtins/function.rs similarity index 100% rename from vm/src/builtins/function.rs rename to crates/vm/src/builtins/function.rs diff --git a/vm/src/builtins/function/jit.rs b/crates/vm/src/builtins/function/jit.rs similarity index 100% rename from vm/src/builtins/function/jit.rs rename to crates/vm/src/builtins/function/jit.rs diff --git a/vm/src/builtins/generator.rs b/crates/vm/src/builtins/generator.rs similarity index 100% rename from vm/src/builtins/generator.rs rename to crates/vm/src/builtins/generator.rs diff --git a/vm/src/builtins/genericalias.rs b/crates/vm/src/builtins/genericalias.rs similarity index 100% rename from vm/src/builtins/genericalias.rs rename to crates/vm/src/builtins/genericalias.rs diff --git a/vm/src/builtins/getset.rs b/crates/vm/src/builtins/getset.rs similarity index 100% rename from vm/src/builtins/getset.rs rename to crates/vm/src/builtins/getset.rs diff --git a/vm/src/builtins/int.rs b/crates/vm/src/builtins/int.rs similarity index 100% rename from vm/src/builtins/int.rs rename to crates/vm/src/builtins/int.rs diff --git a/vm/src/builtins/iter.rs b/crates/vm/src/builtins/iter.rs similarity index 100% rename from vm/src/builtins/iter.rs rename to crates/vm/src/builtins/iter.rs diff --git a/vm/src/builtins/list.rs b/crates/vm/src/builtins/list.rs similarity index 100% rename from vm/src/builtins/list.rs rename to crates/vm/src/builtins/list.rs diff --git a/vm/src/builtins/map.rs b/crates/vm/src/builtins/map.rs similarity index 100% rename from vm/src/builtins/map.rs rename to crates/vm/src/builtins/map.rs diff --git a/vm/src/builtins/mappingproxy.rs b/crates/vm/src/builtins/mappingproxy.rs similarity index 100% rename from vm/src/builtins/mappingproxy.rs rename to crates/vm/src/builtins/mappingproxy.rs diff --git a/vm/src/builtins/memory.rs b/crates/vm/src/builtins/memory.rs similarity index 100% rename from vm/src/builtins/memory.rs rename to crates/vm/src/builtins/memory.rs diff --git a/vm/src/builtins/mod.rs b/crates/vm/src/builtins/mod.rs similarity index 100% rename from vm/src/builtins/mod.rs rename to crates/vm/src/builtins/mod.rs diff --git a/vm/src/builtins/module.rs b/crates/vm/src/builtins/module.rs similarity index 100% rename from vm/src/builtins/module.rs rename to crates/vm/src/builtins/module.rs diff --git a/vm/src/builtins/namespace.rs b/crates/vm/src/builtins/namespace.rs similarity index 100% rename from vm/src/builtins/namespace.rs rename to crates/vm/src/builtins/namespace.rs diff --git a/vm/src/builtins/object.rs b/crates/vm/src/builtins/object.rs similarity index 100% rename from vm/src/builtins/object.rs rename to crates/vm/src/builtins/object.rs diff --git a/vm/src/builtins/property.rs b/crates/vm/src/builtins/property.rs similarity index 100% rename from vm/src/builtins/property.rs rename to crates/vm/src/builtins/property.rs diff --git a/vm/src/builtins/range.rs b/crates/vm/src/builtins/range.rs similarity index 100% rename from vm/src/builtins/range.rs rename to crates/vm/src/builtins/range.rs diff --git a/vm/src/builtins/set.rs b/crates/vm/src/builtins/set.rs similarity index 100% rename from vm/src/builtins/set.rs rename to crates/vm/src/builtins/set.rs diff --git a/vm/src/builtins/singletons.rs b/crates/vm/src/builtins/singletons.rs similarity index 100% rename from vm/src/builtins/singletons.rs rename to crates/vm/src/builtins/singletons.rs diff --git a/vm/src/builtins/slice.rs b/crates/vm/src/builtins/slice.rs similarity index 100% rename from vm/src/builtins/slice.rs rename to crates/vm/src/builtins/slice.rs diff --git a/vm/src/builtins/staticmethod.rs b/crates/vm/src/builtins/staticmethod.rs similarity index 100% rename from vm/src/builtins/staticmethod.rs rename to crates/vm/src/builtins/staticmethod.rs diff --git a/vm/src/builtins/str.rs b/crates/vm/src/builtins/str.rs similarity index 100% rename from vm/src/builtins/str.rs rename to crates/vm/src/builtins/str.rs diff --git a/vm/src/builtins/super.rs b/crates/vm/src/builtins/super.rs similarity index 100% rename from vm/src/builtins/super.rs rename to crates/vm/src/builtins/super.rs diff --git a/vm/src/builtins/traceback.rs b/crates/vm/src/builtins/traceback.rs similarity index 100% rename from vm/src/builtins/traceback.rs rename to crates/vm/src/builtins/traceback.rs diff --git a/vm/src/builtins/tuple.rs b/crates/vm/src/builtins/tuple.rs similarity index 100% rename from vm/src/builtins/tuple.rs rename to crates/vm/src/builtins/tuple.rs diff --git a/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs similarity index 100% rename from vm/src/builtins/type.rs rename to crates/vm/src/builtins/type.rs diff --git a/vm/src/builtins/union.rs b/crates/vm/src/builtins/union.rs similarity index 100% rename from vm/src/builtins/union.rs rename to crates/vm/src/builtins/union.rs diff --git a/vm/src/builtins/weakproxy.rs b/crates/vm/src/builtins/weakproxy.rs similarity index 100% rename from vm/src/builtins/weakproxy.rs rename to crates/vm/src/builtins/weakproxy.rs diff --git a/vm/src/builtins/weakref.rs b/crates/vm/src/builtins/weakref.rs similarity index 100% rename from vm/src/builtins/weakref.rs rename to crates/vm/src/builtins/weakref.rs diff --git a/vm/src/builtins/zip.rs b/crates/vm/src/builtins/zip.rs similarity index 100% rename from vm/src/builtins/zip.rs rename to crates/vm/src/builtins/zip.rs diff --git a/vm/src/byte.rs b/crates/vm/src/byte.rs similarity index 100% rename from vm/src/byte.rs rename to crates/vm/src/byte.rs diff --git a/vm/src/bytes_inner.rs b/crates/vm/src/bytes_inner.rs similarity index 100% rename from vm/src/bytes_inner.rs rename to crates/vm/src/bytes_inner.rs diff --git a/vm/src/cformat.rs b/crates/vm/src/cformat.rs similarity index 100% rename from vm/src/cformat.rs rename to crates/vm/src/cformat.rs diff --git a/vm/src/class.rs b/crates/vm/src/class.rs similarity index 100% rename from vm/src/class.rs rename to crates/vm/src/class.rs diff --git a/vm/src/codecs.rs b/crates/vm/src/codecs.rs similarity index 100% rename from vm/src/codecs.rs rename to crates/vm/src/codecs.rs diff --git a/vm/src/compiler.rs b/crates/vm/src/compiler.rs similarity index 100% rename from vm/src/compiler.rs rename to crates/vm/src/compiler.rs diff --git a/vm/src/convert/into_object.rs b/crates/vm/src/convert/into_object.rs similarity index 100% rename from vm/src/convert/into_object.rs rename to crates/vm/src/convert/into_object.rs diff --git a/vm/src/convert/mod.rs b/crates/vm/src/convert/mod.rs similarity index 100% rename from vm/src/convert/mod.rs rename to crates/vm/src/convert/mod.rs diff --git a/vm/src/convert/to_pyobject.rs b/crates/vm/src/convert/to_pyobject.rs similarity index 100% rename from vm/src/convert/to_pyobject.rs rename to crates/vm/src/convert/to_pyobject.rs diff --git a/vm/src/convert/transmute_from.rs b/crates/vm/src/convert/transmute_from.rs similarity index 100% rename from vm/src/convert/transmute_from.rs rename to crates/vm/src/convert/transmute_from.rs diff --git a/vm/src/convert/try_from.rs b/crates/vm/src/convert/try_from.rs similarity index 100% rename from vm/src/convert/try_from.rs rename to crates/vm/src/convert/try_from.rs diff --git a/vm/src/coroutine.rs b/crates/vm/src/coroutine.rs similarity index 100% rename from vm/src/coroutine.rs rename to crates/vm/src/coroutine.rs diff --git a/vm/src/dict_inner.rs b/crates/vm/src/dict_inner.rs similarity index 100% rename from vm/src/dict_inner.rs rename to crates/vm/src/dict_inner.rs diff --git a/vm/src/eval.rs b/crates/vm/src/eval.rs similarity index 100% rename from vm/src/eval.rs rename to crates/vm/src/eval.rs diff --git a/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs similarity index 100% rename from vm/src/exceptions.rs rename to crates/vm/src/exceptions.rs diff --git a/vm/src/format.rs b/crates/vm/src/format.rs similarity index 100% rename from vm/src/format.rs rename to crates/vm/src/format.rs diff --git a/vm/src/frame.rs b/crates/vm/src/frame.rs similarity index 100% rename from vm/src/frame.rs rename to crates/vm/src/frame.rs diff --git a/vm/src/function/argument.rs b/crates/vm/src/function/argument.rs similarity index 100% rename from vm/src/function/argument.rs rename to crates/vm/src/function/argument.rs diff --git a/vm/src/function/arithmetic.rs b/crates/vm/src/function/arithmetic.rs similarity index 100% rename from vm/src/function/arithmetic.rs rename to crates/vm/src/function/arithmetic.rs diff --git a/vm/src/function/buffer.rs b/crates/vm/src/function/buffer.rs similarity index 100% rename from vm/src/function/buffer.rs rename to crates/vm/src/function/buffer.rs diff --git a/vm/src/function/builtin.rs b/crates/vm/src/function/builtin.rs similarity index 100% rename from vm/src/function/builtin.rs rename to crates/vm/src/function/builtin.rs diff --git a/vm/src/function/either.rs b/crates/vm/src/function/either.rs similarity index 100% rename from vm/src/function/either.rs rename to crates/vm/src/function/either.rs diff --git a/vm/src/function/fspath.rs b/crates/vm/src/function/fspath.rs similarity index 100% rename from vm/src/function/fspath.rs rename to crates/vm/src/function/fspath.rs diff --git a/vm/src/function/getset.rs b/crates/vm/src/function/getset.rs similarity index 100% rename from vm/src/function/getset.rs rename to crates/vm/src/function/getset.rs diff --git a/vm/src/function/method.rs b/crates/vm/src/function/method.rs similarity index 100% rename from vm/src/function/method.rs rename to crates/vm/src/function/method.rs diff --git a/vm/src/function/mod.rs b/crates/vm/src/function/mod.rs similarity index 100% rename from vm/src/function/mod.rs rename to crates/vm/src/function/mod.rs diff --git a/vm/src/function/number.rs b/crates/vm/src/function/number.rs similarity index 100% rename from vm/src/function/number.rs rename to crates/vm/src/function/number.rs diff --git a/vm/src/function/protocol.rs b/crates/vm/src/function/protocol.rs similarity index 100% rename from vm/src/function/protocol.rs rename to crates/vm/src/function/protocol.rs diff --git a/vm/src/import.rs b/crates/vm/src/import.rs similarity index 100% rename from vm/src/import.rs rename to crates/vm/src/import.rs diff --git a/vm/src/intern.rs b/crates/vm/src/intern.rs similarity index 100% rename from vm/src/intern.rs rename to crates/vm/src/intern.rs diff --git a/vm/src/iter.rs b/crates/vm/src/iter.rs similarity index 100% rename from vm/src/iter.rs rename to crates/vm/src/iter.rs diff --git a/vm/src/lib.rs b/crates/vm/src/lib.rs similarity index 100% rename from vm/src/lib.rs rename to crates/vm/src/lib.rs diff --git a/vm/src/macros.rs b/crates/vm/src/macros.rs similarity index 100% rename from vm/src/macros.rs rename to crates/vm/src/macros.rs diff --git a/vm/src/object/core.rs b/crates/vm/src/object/core.rs similarity index 100% rename from vm/src/object/core.rs rename to crates/vm/src/object/core.rs diff --git a/vm/src/object/ext.rs b/crates/vm/src/object/ext.rs similarity index 100% rename from vm/src/object/ext.rs rename to crates/vm/src/object/ext.rs diff --git a/vm/src/object/mod.rs b/crates/vm/src/object/mod.rs similarity index 100% rename from vm/src/object/mod.rs rename to crates/vm/src/object/mod.rs diff --git a/vm/src/object/payload.rs b/crates/vm/src/object/payload.rs similarity index 100% rename from vm/src/object/payload.rs rename to crates/vm/src/object/payload.rs diff --git a/vm/src/object/traverse.rs b/crates/vm/src/object/traverse.rs similarity index 100% rename from vm/src/object/traverse.rs rename to crates/vm/src/object/traverse.rs diff --git a/vm/src/object/traverse_object.rs b/crates/vm/src/object/traverse_object.rs similarity index 100% rename from vm/src/object/traverse_object.rs rename to crates/vm/src/object/traverse_object.rs diff --git a/vm/src/ospath.rs b/crates/vm/src/ospath.rs similarity index 100% rename from vm/src/ospath.rs rename to crates/vm/src/ospath.rs diff --git a/vm/src/prelude.rs b/crates/vm/src/prelude.rs similarity index 100% rename from vm/src/prelude.rs rename to crates/vm/src/prelude.rs diff --git a/vm/src/protocol/buffer.rs b/crates/vm/src/protocol/buffer.rs similarity index 100% rename from vm/src/protocol/buffer.rs rename to crates/vm/src/protocol/buffer.rs diff --git a/vm/src/protocol/callable.rs b/crates/vm/src/protocol/callable.rs similarity index 100% rename from vm/src/protocol/callable.rs rename to crates/vm/src/protocol/callable.rs diff --git a/vm/src/protocol/iter.rs b/crates/vm/src/protocol/iter.rs similarity index 100% rename from vm/src/protocol/iter.rs rename to crates/vm/src/protocol/iter.rs diff --git a/vm/src/protocol/mapping.rs b/crates/vm/src/protocol/mapping.rs similarity index 100% rename from vm/src/protocol/mapping.rs rename to crates/vm/src/protocol/mapping.rs diff --git a/vm/src/protocol/mod.rs b/crates/vm/src/protocol/mod.rs similarity index 100% rename from vm/src/protocol/mod.rs rename to crates/vm/src/protocol/mod.rs diff --git a/vm/src/protocol/number.rs b/crates/vm/src/protocol/number.rs similarity index 100% rename from vm/src/protocol/number.rs rename to crates/vm/src/protocol/number.rs diff --git a/vm/src/protocol/object.rs b/crates/vm/src/protocol/object.rs similarity index 100% rename from vm/src/protocol/object.rs rename to crates/vm/src/protocol/object.rs diff --git a/vm/src/protocol/sequence.rs b/crates/vm/src/protocol/sequence.rs similarity index 100% rename from vm/src/protocol/sequence.rs rename to crates/vm/src/protocol/sequence.rs diff --git a/vm/src/py_io.rs b/crates/vm/src/py_io.rs similarity index 100% rename from vm/src/py_io.rs rename to crates/vm/src/py_io.rs diff --git a/vm/src/py_serde.rs b/crates/vm/src/py_serde.rs similarity index 100% rename from vm/src/py_serde.rs rename to crates/vm/src/py_serde.rs diff --git a/vm/src/readline.rs b/crates/vm/src/readline.rs similarity index 100% rename from vm/src/readline.rs rename to crates/vm/src/readline.rs diff --git a/vm/src/recursion.rs b/crates/vm/src/recursion.rs similarity index 100% rename from vm/src/recursion.rs rename to crates/vm/src/recursion.rs diff --git a/vm/src/scope.rs b/crates/vm/src/scope.rs similarity index 100% rename from vm/src/scope.rs rename to crates/vm/src/scope.rs diff --git a/vm/src/sequence.rs b/crates/vm/src/sequence.rs similarity index 100% rename from vm/src/sequence.rs rename to crates/vm/src/sequence.rs diff --git a/vm/src/signal.rs b/crates/vm/src/signal.rs similarity index 100% rename from vm/src/signal.rs rename to crates/vm/src/signal.rs diff --git a/vm/src/sliceable.rs b/crates/vm/src/sliceable.rs similarity index 100% rename from vm/src/sliceable.rs rename to crates/vm/src/sliceable.rs diff --git a/vm/src/stdlib/ast.rs b/crates/vm/src/stdlib/ast.rs similarity index 100% rename from vm/src/stdlib/ast.rs rename to crates/vm/src/stdlib/ast.rs diff --git a/vm/src/stdlib/ast/argument.rs b/crates/vm/src/stdlib/ast/argument.rs similarity index 100% rename from vm/src/stdlib/ast/argument.rs rename to crates/vm/src/stdlib/ast/argument.rs diff --git a/vm/src/stdlib/ast/basic.rs b/crates/vm/src/stdlib/ast/basic.rs similarity index 100% rename from vm/src/stdlib/ast/basic.rs rename to crates/vm/src/stdlib/ast/basic.rs diff --git a/vm/src/stdlib/ast/constant.rs b/crates/vm/src/stdlib/ast/constant.rs similarity index 100% rename from vm/src/stdlib/ast/constant.rs rename to crates/vm/src/stdlib/ast/constant.rs diff --git a/vm/src/stdlib/ast/elif_else_clause.rs b/crates/vm/src/stdlib/ast/elif_else_clause.rs similarity index 100% rename from vm/src/stdlib/ast/elif_else_clause.rs rename to crates/vm/src/stdlib/ast/elif_else_clause.rs diff --git a/vm/src/stdlib/ast/exception.rs b/crates/vm/src/stdlib/ast/exception.rs similarity index 100% rename from vm/src/stdlib/ast/exception.rs rename to crates/vm/src/stdlib/ast/exception.rs diff --git a/vm/src/stdlib/ast/expression.rs b/crates/vm/src/stdlib/ast/expression.rs similarity index 100% rename from vm/src/stdlib/ast/expression.rs rename to crates/vm/src/stdlib/ast/expression.rs diff --git a/vm/src/stdlib/ast/module.rs b/crates/vm/src/stdlib/ast/module.rs similarity index 100% rename from vm/src/stdlib/ast/module.rs rename to crates/vm/src/stdlib/ast/module.rs diff --git a/vm/src/stdlib/ast/node.rs b/crates/vm/src/stdlib/ast/node.rs similarity index 100% rename from vm/src/stdlib/ast/node.rs rename to crates/vm/src/stdlib/ast/node.rs diff --git a/vm/src/stdlib/ast/operator.rs b/crates/vm/src/stdlib/ast/operator.rs similarity index 100% rename from vm/src/stdlib/ast/operator.rs rename to crates/vm/src/stdlib/ast/operator.rs diff --git a/vm/src/stdlib/ast/other.rs b/crates/vm/src/stdlib/ast/other.rs similarity index 100% rename from vm/src/stdlib/ast/other.rs rename to crates/vm/src/stdlib/ast/other.rs diff --git a/vm/src/stdlib/ast/parameter.rs b/crates/vm/src/stdlib/ast/parameter.rs similarity index 100% rename from vm/src/stdlib/ast/parameter.rs rename to crates/vm/src/stdlib/ast/parameter.rs diff --git a/vm/src/stdlib/ast/pattern.rs b/crates/vm/src/stdlib/ast/pattern.rs similarity index 100% rename from vm/src/stdlib/ast/pattern.rs rename to crates/vm/src/stdlib/ast/pattern.rs diff --git a/vm/src/stdlib/ast/pyast.rs b/crates/vm/src/stdlib/ast/pyast.rs similarity index 100% rename from vm/src/stdlib/ast/pyast.rs rename to crates/vm/src/stdlib/ast/pyast.rs diff --git a/vm/src/stdlib/ast/python.rs b/crates/vm/src/stdlib/ast/python.rs similarity index 100% rename from vm/src/stdlib/ast/python.rs rename to crates/vm/src/stdlib/ast/python.rs diff --git a/vm/src/stdlib/ast/statement.rs b/crates/vm/src/stdlib/ast/statement.rs similarity index 100% rename from vm/src/stdlib/ast/statement.rs rename to crates/vm/src/stdlib/ast/statement.rs diff --git a/vm/src/stdlib/ast/string.rs b/crates/vm/src/stdlib/ast/string.rs similarity index 100% rename from vm/src/stdlib/ast/string.rs rename to crates/vm/src/stdlib/ast/string.rs diff --git a/vm/src/stdlib/ast/type_ignore.rs b/crates/vm/src/stdlib/ast/type_ignore.rs similarity index 100% rename from vm/src/stdlib/ast/type_ignore.rs rename to crates/vm/src/stdlib/ast/type_ignore.rs diff --git a/vm/src/stdlib/ast/type_parameters.rs b/crates/vm/src/stdlib/ast/type_parameters.rs similarity index 100% rename from vm/src/stdlib/ast/type_parameters.rs rename to crates/vm/src/stdlib/ast/type_parameters.rs diff --git a/vm/src/stdlib/atexit.rs b/crates/vm/src/stdlib/atexit.rs similarity index 100% rename from vm/src/stdlib/atexit.rs rename to crates/vm/src/stdlib/atexit.rs diff --git a/vm/src/stdlib/builtins.rs b/crates/vm/src/stdlib/builtins.rs similarity index 100% rename from vm/src/stdlib/builtins.rs rename to crates/vm/src/stdlib/builtins.rs diff --git a/vm/src/stdlib/codecs.rs b/crates/vm/src/stdlib/codecs.rs similarity index 100% rename from vm/src/stdlib/codecs.rs rename to crates/vm/src/stdlib/codecs.rs diff --git a/vm/src/stdlib/collections.rs b/crates/vm/src/stdlib/collections.rs similarity index 100% rename from vm/src/stdlib/collections.rs rename to crates/vm/src/stdlib/collections.rs diff --git a/vm/src/stdlib/ctypes.rs b/crates/vm/src/stdlib/ctypes.rs similarity index 100% rename from vm/src/stdlib/ctypes.rs rename to crates/vm/src/stdlib/ctypes.rs diff --git a/vm/src/stdlib/ctypes/array.rs b/crates/vm/src/stdlib/ctypes/array.rs similarity index 100% rename from vm/src/stdlib/ctypes/array.rs rename to crates/vm/src/stdlib/ctypes/array.rs diff --git a/vm/src/stdlib/ctypes/base.rs b/crates/vm/src/stdlib/ctypes/base.rs similarity index 100% rename from vm/src/stdlib/ctypes/base.rs rename to crates/vm/src/stdlib/ctypes/base.rs diff --git a/vm/src/stdlib/ctypes/function.rs b/crates/vm/src/stdlib/ctypes/function.rs similarity index 100% rename from vm/src/stdlib/ctypes/function.rs rename to crates/vm/src/stdlib/ctypes/function.rs diff --git a/vm/src/stdlib/ctypes/library.rs b/crates/vm/src/stdlib/ctypes/library.rs similarity index 100% rename from vm/src/stdlib/ctypes/library.rs rename to crates/vm/src/stdlib/ctypes/library.rs diff --git a/vm/src/stdlib/ctypes/pointer.rs b/crates/vm/src/stdlib/ctypes/pointer.rs similarity index 100% rename from vm/src/stdlib/ctypes/pointer.rs rename to crates/vm/src/stdlib/ctypes/pointer.rs diff --git a/vm/src/stdlib/ctypes/structure.rs b/crates/vm/src/stdlib/ctypes/structure.rs similarity index 100% rename from vm/src/stdlib/ctypes/structure.rs rename to crates/vm/src/stdlib/ctypes/structure.rs diff --git a/vm/src/stdlib/ctypes/union.rs b/crates/vm/src/stdlib/ctypes/union.rs similarity index 100% rename from vm/src/stdlib/ctypes/union.rs rename to crates/vm/src/stdlib/ctypes/union.rs diff --git a/vm/src/stdlib/errno.rs b/crates/vm/src/stdlib/errno.rs similarity index 100% rename from vm/src/stdlib/errno.rs rename to crates/vm/src/stdlib/errno.rs diff --git a/vm/src/stdlib/functools.rs b/crates/vm/src/stdlib/functools.rs similarity index 100% rename from vm/src/stdlib/functools.rs rename to crates/vm/src/stdlib/functools.rs diff --git a/vm/src/stdlib/imp.rs b/crates/vm/src/stdlib/imp.rs similarity index 100% rename from vm/src/stdlib/imp.rs rename to crates/vm/src/stdlib/imp.rs diff --git a/vm/src/stdlib/io.rs b/crates/vm/src/stdlib/io.rs similarity index 100% rename from vm/src/stdlib/io.rs rename to crates/vm/src/stdlib/io.rs diff --git a/vm/src/stdlib/itertools.rs b/crates/vm/src/stdlib/itertools.rs similarity index 100% rename from vm/src/stdlib/itertools.rs rename to crates/vm/src/stdlib/itertools.rs diff --git a/vm/src/stdlib/marshal.rs b/crates/vm/src/stdlib/marshal.rs similarity index 100% rename from vm/src/stdlib/marshal.rs rename to crates/vm/src/stdlib/marshal.rs diff --git a/vm/src/stdlib/mod.rs b/crates/vm/src/stdlib/mod.rs similarity index 100% rename from vm/src/stdlib/mod.rs rename to crates/vm/src/stdlib/mod.rs diff --git a/vm/src/stdlib/msvcrt.rs b/crates/vm/src/stdlib/msvcrt.rs similarity index 100% rename from vm/src/stdlib/msvcrt.rs rename to crates/vm/src/stdlib/msvcrt.rs diff --git a/vm/src/stdlib/nt.rs b/crates/vm/src/stdlib/nt.rs similarity index 100% rename from vm/src/stdlib/nt.rs rename to crates/vm/src/stdlib/nt.rs diff --git a/vm/src/stdlib/operator.rs b/crates/vm/src/stdlib/operator.rs similarity index 100% rename from vm/src/stdlib/operator.rs rename to crates/vm/src/stdlib/operator.rs diff --git a/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs similarity index 100% rename from vm/src/stdlib/os.rs rename to crates/vm/src/stdlib/os.rs diff --git a/vm/src/stdlib/posix.rs b/crates/vm/src/stdlib/posix.rs similarity index 100% rename from vm/src/stdlib/posix.rs rename to crates/vm/src/stdlib/posix.rs diff --git a/vm/src/stdlib/posix_compat.rs b/crates/vm/src/stdlib/posix_compat.rs similarity index 100% rename from vm/src/stdlib/posix_compat.rs rename to crates/vm/src/stdlib/posix_compat.rs diff --git a/vm/src/stdlib/pwd.rs b/crates/vm/src/stdlib/pwd.rs similarity index 100% rename from vm/src/stdlib/pwd.rs rename to crates/vm/src/stdlib/pwd.rs diff --git a/vm/src/stdlib/signal.rs b/crates/vm/src/stdlib/signal.rs similarity index 100% rename from vm/src/stdlib/signal.rs rename to crates/vm/src/stdlib/signal.rs diff --git a/vm/src/stdlib/sre.rs b/crates/vm/src/stdlib/sre.rs similarity index 100% rename from vm/src/stdlib/sre.rs rename to crates/vm/src/stdlib/sre.rs diff --git a/vm/src/stdlib/stat.rs b/crates/vm/src/stdlib/stat.rs similarity index 100% rename from vm/src/stdlib/stat.rs rename to crates/vm/src/stdlib/stat.rs diff --git a/vm/src/stdlib/string.rs b/crates/vm/src/stdlib/string.rs similarity index 100% rename from vm/src/stdlib/string.rs rename to crates/vm/src/stdlib/string.rs diff --git a/vm/src/stdlib/symtable.rs b/crates/vm/src/stdlib/symtable.rs similarity index 100% rename from vm/src/stdlib/symtable.rs rename to crates/vm/src/stdlib/symtable.rs diff --git a/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs similarity index 100% rename from vm/src/stdlib/sys.rs rename to crates/vm/src/stdlib/sys.rs diff --git a/vm/src/stdlib/sysconfig.rs b/crates/vm/src/stdlib/sysconfig.rs similarity index 100% rename from vm/src/stdlib/sysconfig.rs rename to crates/vm/src/stdlib/sysconfig.rs diff --git a/vm/src/stdlib/sysconfigdata.rs b/crates/vm/src/stdlib/sysconfigdata.rs similarity index 100% rename from vm/src/stdlib/sysconfigdata.rs rename to crates/vm/src/stdlib/sysconfigdata.rs diff --git a/vm/src/stdlib/thread.rs b/crates/vm/src/stdlib/thread.rs similarity index 100% rename from vm/src/stdlib/thread.rs rename to crates/vm/src/stdlib/thread.rs diff --git a/vm/src/stdlib/time.rs b/crates/vm/src/stdlib/time.rs similarity index 100% rename from vm/src/stdlib/time.rs rename to crates/vm/src/stdlib/time.rs diff --git a/vm/src/stdlib/typevar.rs b/crates/vm/src/stdlib/typevar.rs similarity index 100% rename from vm/src/stdlib/typevar.rs rename to crates/vm/src/stdlib/typevar.rs diff --git a/vm/src/stdlib/typing.rs b/crates/vm/src/stdlib/typing.rs similarity index 100% rename from vm/src/stdlib/typing.rs rename to crates/vm/src/stdlib/typing.rs diff --git a/vm/src/stdlib/warnings.rs b/crates/vm/src/stdlib/warnings.rs similarity index 100% rename from vm/src/stdlib/warnings.rs rename to crates/vm/src/stdlib/warnings.rs diff --git a/vm/src/stdlib/weakref.rs b/crates/vm/src/stdlib/weakref.rs similarity index 100% rename from vm/src/stdlib/weakref.rs rename to crates/vm/src/stdlib/weakref.rs diff --git a/vm/src/stdlib/winapi.rs b/crates/vm/src/stdlib/winapi.rs similarity index 100% rename from vm/src/stdlib/winapi.rs rename to crates/vm/src/stdlib/winapi.rs diff --git a/vm/src/stdlib/winreg.rs b/crates/vm/src/stdlib/winreg.rs similarity index 100% rename from vm/src/stdlib/winreg.rs rename to crates/vm/src/stdlib/winreg.rs diff --git a/vm/src/suggestion.rs b/crates/vm/src/suggestion.rs similarity index 100% rename from vm/src/suggestion.rs rename to crates/vm/src/suggestion.rs diff --git a/vm/src/types/mod.rs b/crates/vm/src/types/mod.rs similarity index 100% rename from vm/src/types/mod.rs rename to crates/vm/src/types/mod.rs diff --git a/vm/src/types/slot.rs b/crates/vm/src/types/slot.rs similarity index 100% rename from vm/src/types/slot.rs rename to crates/vm/src/types/slot.rs diff --git a/vm/src/types/structseq.rs b/crates/vm/src/types/structseq.rs similarity index 100% rename from vm/src/types/structseq.rs rename to crates/vm/src/types/structseq.rs diff --git a/vm/src/types/zoo.rs b/crates/vm/src/types/zoo.rs similarity index 100% rename from vm/src/types/zoo.rs rename to crates/vm/src/types/zoo.rs diff --git a/vm/src/utils.rs b/crates/vm/src/utils.rs similarity index 100% rename from vm/src/utils.rs rename to crates/vm/src/utils.rs diff --git a/vm/src/version.rs b/crates/vm/src/version.rs similarity index 100% rename from vm/src/version.rs rename to crates/vm/src/version.rs diff --git a/vm/src/vm/compile.rs b/crates/vm/src/vm/compile.rs similarity index 100% rename from vm/src/vm/compile.rs rename to crates/vm/src/vm/compile.rs diff --git a/vm/src/vm/context.rs b/crates/vm/src/vm/context.rs similarity index 100% rename from vm/src/vm/context.rs rename to crates/vm/src/vm/context.rs diff --git a/vm/src/vm/interpreter.rs b/crates/vm/src/vm/interpreter.rs similarity index 100% rename from vm/src/vm/interpreter.rs rename to crates/vm/src/vm/interpreter.rs diff --git a/vm/src/vm/method.rs b/crates/vm/src/vm/method.rs similarity index 100% rename from vm/src/vm/method.rs rename to crates/vm/src/vm/method.rs diff --git a/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs similarity index 99% rename from vm/src/vm/mod.rs rename to crates/vm/src/vm/mod.rs index a973140a99a..b793a283525 100644 --- a/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -1036,7 +1036,9 @@ fn test_nested_frozen() { vm::Interpreter::with_init(Default::default(), |vm| { // vm.add_native_modules(rustpython_stdlib::get_module_inits()); - vm.add_frozen(rustpython_vm::py_freeze!(dir = "../extra_tests/snippets")); + vm.add_frozen(rustpython_vm::py_freeze!( + dir = "../../extra_tests/snippets" + )); }) .enter(|vm| { let scope = vm.new_scope_with_builtins(); diff --git a/vm/src/vm/setting.rs b/crates/vm/src/vm/setting.rs similarity index 100% rename from vm/src/vm/setting.rs rename to crates/vm/src/vm/setting.rs diff --git a/vm/src/vm/thread.rs b/crates/vm/src/vm/thread.rs similarity index 100% rename from vm/src/vm/thread.rs rename to crates/vm/src/vm/thread.rs diff --git a/vm/src/vm/vm_new.rs b/crates/vm/src/vm/vm_new.rs similarity index 100% rename from vm/src/vm/vm_new.rs rename to crates/vm/src/vm/vm_new.rs diff --git a/vm/src/vm/vm_object.rs b/crates/vm/src/vm/vm_object.rs similarity index 100% rename from vm/src/vm/vm_object.rs rename to crates/vm/src/vm/vm_object.rs diff --git a/vm/src/vm/vm_ops.rs b/crates/vm/src/vm/vm_ops.rs similarity index 100% rename from vm/src/vm/vm_ops.rs rename to crates/vm/src/vm/vm_ops.rs diff --git a/vm/src/warn.rs b/crates/vm/src/warn.rs similarity index 100% rename from vm/src/warn.rs rename to crates/vm/src/warn.rs diff --git a/vm/src/windows.rs b/crates/vm/src/windows.rs similarity index 100% rename from vm/src/windows.rs rename to crates/vm/src/windows.rs diff --git a/example_projects/barebone/Cargo.toml b/example_projects/barebone/Cargo.toml index 8bc49c237f3..b69617bdaf7 100644 --- a/example_projects/barebone/Cargo.toml +++ b/example_projects/barebone/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -rustpython-vm = { path = "../../vm", default-features = false } +rustpython-vm = { path = "../../crates/vm", default-features = false } [workspace] diff --git a/example_projects/frozen_stdlib/Cargo.toml b/example_projects/frozen_stdlib/Cargo.toml index 6824865cbf7..91bb14a083b 100644 --- a/example_projects/frozen_stdlib/Cargo.toml +++ b/example_projects/frozen_stdlib/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] rustpython = { path = "../../", default-features = false, features = ["freeze-stdlib"] } -rustpython-vm = { path = "../../vm", default-features = false, features = ["freeze-stdlib"] } +rustpython-vm = { path = "../../crates/vm", default-features = false, features = ["freeze-stdlib"] } rustpython-pylib = { path = "../../crates/pylib", default-features = false, features = ["freeze-stdlib"] } [workspace] diff --git a/vm/Lib/core_modules/codecs.py b/vm/Lib/core_modules/codecs.py deleted file mode 120000 index db3231198d9..00000000000 --- a/vm/Lib/core_modules/codecs.py +++ /dev/null @@ -1 +0,0 @@ -../../../Lib/codecs.py \ No newline at end of file diff --git a/vm/Lib/core_modules/copyreg.py b/vm/Lib/core_modules/copyreg.py deleted file mode 120000 index 4ac7f40c43d..00000000000 --- a/vm/Lib/core_modules/copyreg.py +++ /dev/null @@ -1 +0,0 @@ -../../../Lib/copyreg.py \ No newline at end of file diff --git a/vm/Lib/core_modules/encodings_utf_8.py b/vm/Lib/core_modules/encodings_utf_8.py deleted file mode 120000 index a8f34066264..00000000000 --- a/vm/Lib/core_modules/encodings_utf_8.py +++ /dev/null @@ -1 +0,0 @@ -../../../Lib/encodings/utf_8.py \ No newline at end of file diff --git a/vm/Lib/python_builtins/__hello__.py b/vm/Lib/python_builtins/__hello__.py deleted file mode 120000 index f6cae8932f0..00000000000 --- a/vm/Lib/python_builtins/__hello__.py +++ /dev/null @@ -1 +0,0 @@ -../../../Lib/__hello__.py \ No newline at end of file diff --git a/vm/Lib/python_builtins/__phello__ b/vm/Lib/python_builtins/__phello__ deleted file mode 120000 index 113aeb15040..00000000000 --- a/vm/Lib/python_builtins/__phello__ +++ /dev/null @@ -1 +0,0 @@ -../../../Lib/__phello__ \ No newline at end of file diff --git a/vm/Lib/python_builtins/_frozen_importlib.py b/vm/Lib/python_builtins/_frozen_importlib.py deleted file mode 120000 index d1d4364abac..00000000000 --- a/vm/Lib/python_builtins/_frozen_importlib.py +++ /dev/null @@ -1 +0,0 @@ -../../../Lib/importlib/_bootstrap.py \ No newline at end of file diff --git a/vm/Lib/python_builtins/_frozen_importlib_external.py b/vm/Lib/python_builtins/_frozen_importlib_external.py deleted file mode 120000 index ba8aff58051..00000000000 --- a/vm/Lib/python_builtins/_frozen_importlib_external.py +++ /dev/null @@ -1 +0,0 @@ -../../../Lib/importlib/_bootstrap_external.py \ No newline at end of file diff --git a/vm/Lib/python_builtins/_thread.py b/vm/Lib/python_builtins/_thread.py deleted file mode 120000 index fa4a34c4fb9..00000000000 --- a/vm/Lib/python_builtins/_thread.py +++ /dev/null @@ -1 +0,0 @@ -../../../Lib/_dummy_thread.py \ No newline at end of file diff --git a/wasm/wasm-unknown-test/Cargo.toml b/wasm/wasm-unknown-test/Cargo.toml index ed8c9fcb02e..277a9810b99 100644 --- a/wasm/wasm-unknown-test/Cargo.toml +++ b/wasm/wasm-unknown-test/Cargo.toml @@ -8,7 +8,7 @@ crate-type = ["cdylib"] [dependencies] getrandom = "0.3" -rustpython-vm = { path = "../../vm", default-features = false, features = ["compiler"] } +rustpython-vm = { path = "../../crates/vm", default-features = false, features = ["compiler"] } [workspace]