Skip to content

Move derive -> crates/derive #6264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 8 commits into from
Nov 15, 2025
Merged

Move derive -> crates/derive #6264

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2581bbb
Move `derive` -> `crates/derive`
ShaharNaveh Nov 14, 2025
dc7df08
Use derive from workspace
ShaharNaveh Nov 14, 2025
d18a52f
Update jit/Cargo.toml
ShaharNaveh Nov 14, 2025
af468aa
Merge remote-tracking branch 'upstream/main' into move-derive
ShaharNaveh Nov 15, 2025
bcb8d34
Merge remote-tracking branch 'upstream/main' into move-derive
ShaharNaveh Nov 15, 2025
4cb2e44
Merge remote-tracking branch 'upstream/main' into move-derive
ShaharNaveh Nov 15, 2025
a8954e4
fix bad merge
ShaharNaveh Nov 15, 2025
1ce2f09
Merge remote-tracking branch 'upstream/main' into move-derive
ShaharNaveh Nov 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ members = [
"compiler/literal",
".",
"common",
"derive",
"jit",
"vm",
"vm/sre_engine",
Expand All @@ -152,7 +151,7 @@ rustpython-compiler-core = { path = "compiler/core", version = "0.4.0" }
rustpython-compiler = { path = "compiler", version = "0.4.0" }
rustpython-codegen = { path = "compiler/codegen", version = "0.4.0" }
rustpython-common = { path = "common", version = "0.4.0" }
rustpython-derive = { path = "derive", version = "0.4.0" }
rustpython-derive = { path = "crates/derive", version = "0.4.0" }
rustpython-derive-impl = { path = "derive-impl", version = "0.4.0" }
rustpython-jit = { path = "jit", version = "0.4.0" }
rustpython-literal = { path = "compiler/literal", version = "0.4.0" }
Expand Down
0 derive/Cargo.toml → crates/derive/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 derive/src/lib.rs → crates/derive/src/lib.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion jit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cranelift-jit = "0.119"
cranelift-module = "0.119"

[dev-dependencies]
rustpython-derive = { path = "../derive", version = "0.4.0" }
rustpython-derive = { workspace = true, version = "0.4.0" }
Comment thread
ShaharNaveh marked this conversation as resolved.
Outdated

approx = "0.5.1"

Expand Down
Loading