Skip to content

Commit 4cb2e44

Browse files
committed
Merge remote-tracking branch 'upstream/main' into move-derive
2 parents bcb8d34 + 041dd30 commit 4cb2e44

24 files changed

Lines changed: 2 additions & 6 deletions

Cargo.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,9 @@ template = "installer-config/installer.wxs"
121121
[workspace]
122122
resolver = "2"
123123
members = [
124-
"compiler",
125124
".",
126125
"vm",
127-
"vm/sre_engine",
128126
"stdlib",
129-
"derive-impl",
130127
"wasm/lib",
131128
"crates/*",
132129
]
@@ -141,17 +138,16 @@ license = "MIT"
141138

142139
[workspace.dependencies]
143140
rustpython-compiler-core = { path = "crates/compiler-core", version = "0.4.0" }
144-
rustpython-compiler = { path = "compiler", version = "0.4.0" }
145141
rustpython-derive = { path = "crates/derive", version = "0.4.0" }
146142
rustpython-codegen = { path = "crates/codegen", version = "0.4.0" }
147143
rustpython-common = { path = "crates/common", version = "0.4.0" }
148-
rustpython-derive-impl = { path = "derive-impl", version = "0.4.0" }
144+
rustpython-derive-impl = { path = "crates/derive-impl", version = "0.4.0" }
149145
rustpython-jit = { path = "crates/jit", version = "0.4.0" }
150146
rustpython-literal = { path = "crates/literal", version = "0.4.0" }
151147
rustpython-vm = { path = "vm", default-features = false, version = "0.4.0" }
152148
rustpython-pylib = { path = "crates/pylib", version = "0.4.0" }
153149
rustpython-stdlib = { path = "stdlib", default-features = false, version = "0.4.0" }
154-
rustpython-sre_engine = { path = "vm/sre_engine", version = "0.4.0" }
150+
rustpython-sre_engine = { path = "crates/sre_engine", version = "0.4.0" }
155151
rustpython-wtf8 = { path = "crates/wtf8", version = "0.4.0" }
156152
rustpython-doc = { path = "crates/doc", version = "0.4.0" }
157153

File renamed without changes.

0 commit comments

Comments
 (0)