Skip to content

Commit 07a93c7

Browse files
authored
Merge branch 'main' into move-compiler-codegen
2 parents b63b29c + 2071fa2 commit 07a93c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+12
-15
lines changed

Cargo.toml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,13 @@ template = "installer-config/installer.wxs"
122122
resolver = "2"
123123
members = [
124124
"compiler",
125-
"compiler/core",
126-
"compiler/literal",
127125
".",
128-
"common",
129126
"derive",
130127
"jit",
131128
"vm",
132129
"vm/sre_engine",
133-
"pylib",
134130
"stdlib",
135131
"derive-impl",
136-
"wtf8",
137132
"wasm/lib",
138133
"crates/*",
139134
]
@@ -147,19 +142,19 @@ repository = "https://github.com/RustPython/RustPython"
147142
license = "MIT"
148143

149144
[workspace.dependencies]
150-
rustpython-compiler-core = { path = "compiler/core", version = "0.4.0" }
145+
rustpython-compiler-core = { path = "crates/compiler-core", version = "0.4.0" }
151146
rustpython-compiler = { path = "compiler", version = "0.4.0" }
152147
rustpython-codegen = { path = "crates/codegen", version = "0.4.0" }
153-
rustpython-common = { path = "common", version = "0.4.0" }
148+
rustpython-common = { path = "crates/common", version = "0.4.0" }
154149
rustpython-derive = { path = "derive", version = "0.4.0" }
155150
rustpython-derive-impl = { path = "derive-impl", version = "0.4.0" }
156151
rustpython-jit = { path = "jit", version = "0.4.0" }
157-
rustpython-literal = { path = "compiler/literal", version = "0.4.0" }
152+
rustpython-literal = { path = "crates/literal", version = "0.4.0" }
158153
rustpython-vm = { path = "vm", default-features = false, version = "0.4.0" }
159-
rustpython-pylib = { path = "pylib", version = "0.4.0" }
154+
rustpython-pylib = { path = "crates/pylib", version = "0.4.0" }
160155
rustpython-stdlib = { path = "stdlib", default-features = false, version = "0.4.0" }
161156
rustpython-sre_engine = { path = "vm/sre_engine", version = "0.4.0" }
162-
rustpython-wtf8 = { path = "wtf8", version = "0.4.0" }
157+
rustpython-wtf8 = { path = "crates/wtf8", version = "0.4.0" }
163158
rustpython-doc = { path = "crates/doc", version = "0.4.0" }
164159

165160
ruff_python_parser = { git = "https://github.com/astral-sh/ruff.git", tag = "0.14.1" }

0 commit comments

Comments
 (0)