Skip to content

Commit a68d2bf

Browse files
committed
Merge remote-tracking branch 'upstream/main' into move-sre-engine
2 parents 88a2c16 + cc2e84b commit a68d2bf

27 files changed

+3
-5
lines changed

Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,8 @@ template = "installer-config/installer.wxs"
122122
resolver = "2"
123123
members = [
124124
"compiler",
125-
"compiler/codegen",
126125
".",
127126
"derive",
128-
"jit",
129127
"vm",
130128
"stdlib",
131129
"derive-impl",
@@ -144,11 +142,11 @@ license = "MIT"
144142
[workspace.dependencies]
145143
rustpython-compiler-core = { path = "crates/compiler-core", version = "0.4.0" }
146144
rustpython-compiler = { path = "compiler", version = "0.4.0" }
147-
rustpython-codegen = { path = "compiler/codegen", version = "0.4.0" }
145+
rustpython-codegen = { path = "crates/codegen", version = "0.4.0" }
148146
rustpython-common = { path = "crates/common", version = "0.4.0" }
149147
rustpython-derive = { path = "derive", version = "0.4.0" }
150148
rustpython-derive-impl = { path = "derive-impl", version = "0.4.0" }
151-
rustpython-jit = { path = "jit", version = "0.4.0" }
149+
rustpython-jit = { path = "crates/jit", version = "0.4.0" }
152150
rustpython-literal = { path = "crates/literal", version = "0.4.0" }
153151
rustpython-vm = { path = "vm", default-features = false, version = "0.4.0" }
154152
rustpython-pylib = { path = "crates/pylib", version = "0.4.0" }

compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ands.snap renamed to crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ands.snap

File renamed without changes.

compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__if_mixed.snap renamed to crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_mixed.snap

File renamed without changes.

compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ors.snap renamed to crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ors.snap

File renamed without changes.

compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__nested_double_async_with.snap renamed to crates/codegen/src/snapshots/rustpython_codegen__compile__tests__nested_double_async_with.snap

File renamed without changes.

0 commit comments

Comments
 (0)