From 2581bbb516d04d6d9bb56af42e535f2991950289 Mon Sep 17 00:00:00 2001
From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com>
Date: Fri, 14 Nov 2025 22:57:54 +0200
Subject: [PATCH 1/4] Move `derive` -> `crates/derive`

---
 Cargo.toml                           | 3 +--
 {derive => crates/derive}/Cargo.toml | 0
 {derive => crates/derive}/src/lib.rs | 0
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename {derive => crates/derive}/Cargo.toml (100%)
 rename {derive => crates/derive}/src/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index b01734ae7a..8aa1a658aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -127,7 +127,6 @@ members = [
     "compiler/literal",
     ".",
     "common",
-    "derive",
     "jit",
     "vm",
     "vm/sre_engine",
@@ -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" }
diff --git a/derive/Cargo.toml b/crates/derive/Cargo.toml
similarity index 100%
rename from derive/Cargo.toml
rename to crates/derive/Cargo.toml
diff --git a/derive/src/lib.rs b/crates/derive/src/lib.rs
similarity index 100%
rename from derive/src/lib.rs
rename to crates/derive/src/lib.rs

From dc7df081ab76db3044985a3094dadfbad733ce88 Mon Sep 17 00:00:00 2001
From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com>
Date: Fri, 14 Nov 2025 22:58:45 +0200
Subject: [PATCH 2/4] Use derive from workspace

---
 jit/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jit/Cargo.toml b/jit/Cargo.toml
index 5708ae367b..26f8ed4a3f 100644
--- a/jit/Cargo.toml
+++ b/jit/Cargo.toml
@@ -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" }
 
 approx = "0.5.1"
 

From d18a52f1dd345fa29eebe071417d551656f5222d Mon Sep 17 00:00:00 2001
From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com>
Date: Fri, 14 Nov 2025 23:46:20 +0200
Subject: [PATCH 3/4] Update jit/Cargo.toml

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 jit/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jit/Cargo.toml b/jit/Cargo.toml
index 26f8ed4a3f..2ef8c344a9 100644
--- a/jit/Cargo.toml
+++ b/jit/Cargo.toml
@@ -22,7 +22,7 @@ cranelift-jit = "0.119"
 cranelift-module = "0.119"
 
 [dev-dependencies]
-rustpython-derive = { workspace = true, version = "0.4.0" }
+rustpython-derive = { workspace = true }
 
 approx = "0.5.1"
 

From a8954e4de0c235b0c85d4ea3c389130f0b87fc1d Mon Sep 17 00:00:00 2001
From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com>
Date: Sat, 15 Nov 2025 13:59:25 +0200
Subject: [PATCH 4/4] fix bad merge

---
 Cargo.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4e705cdd00..6c3890f8a3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -138,9 +138,10 @@ license = "MIT"
 
 [workspace.dependencies]
 rustpython-compiler-core = { path = "crates/compiler-core", version = "0.4.0" }
-rustpython-derive = { path = "crates/derive", version = "0.4.0" }
+rustpython-compiler = { path = "crates/compiler", version = "0.4.0" }
 rustpython-codegen = { path = "crates/codegen", version = "0.4.0" }
 rustpython-common = { path = "crates/common", version = "0.4.0" }
+rustpython-derive = { path = "crates/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" }