From 6d6f9c27c20ea79281a3e6fd5d7dbff66e4c2230 Mon Sep 17 00:00:00 2001
From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com>
Date: Fri, 14 Nov 2025 22:43:44 +0200
Subject: [PATCH 1/2] move `derive-impl` -> `crates/derive-impl`

---
 Cargo.toml                                                  | 3 +--
 {derive-impl => crates/derive-impl}/Cargo.toml              | 0
 {derive-impl => crates/derive-impl}/src/compile_bytecode.rs | 0
 {derive-impl => crates/derive-impl}/src/error.rs            | 0
 {derive-impl => crates/derive-impl}/src/from_args.rs        | 0
 {derive-impl => crates/derive-impl}/src/lib.rs              | 0
 {derive-impl => crates/derive-impl}/src/pyclass.rs          | 0
 {derive-impl => crates/derive-impl}/src/pymodule.rs         | 0
 {derive-impl => crates/derive-impl}/src/pypayload.rs        | 0
 {derive-impl => crates/derive-impl}/src/pystructseq.rs      | 0
 {derive-impl => crates/derive-impl}/src/pytraverse.rs       | 0
 {derive-impl => crates/derive-impl}/src/util.rs             | 0
 12 files changed, 1 insertion(+), 2 deletions(-)
 rename {derive-impl => crates/derive-impl}/Cargo.toml (100%)
 rename {derive-impl => crates/derive-impl}/src/compile_bytecode.rs (100%)
 rename {derive-impl => crates/derive-impl}/src/error.rs (100%)
 rename {derive-impl => crates/derive-impl}/src/from_args.rs (100%)
 rename {derive-impl => crates/derive-impl}/src/lib.rs (100%)
 rename {derive-impl => crates/derive-impl}/src/pyclass.rs (100%)
 rename {derive-impl => crates/derive-impl}/src/pymodule.rs (100%)
 rename {derive-impl => crates/derive-impl}/src/pypayload.rs (100%)
 rename {derive-impl => crates/derive-impl}/src/pystructseq.rs (100%)
 rename {derive-impl => crates/derive-impl}/src/pytraverse.rs (100%)
 rename {derive-impl => crates/derive-impl}/src/util.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index b01734ae7ae..29a3d9e73f9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -133,7 +133,6 @@ members = [
     "vm/sre_engine",
     "pylib",
     "stdlib",
-    "derive-impl",
     "wtf8",
     "wasm/lib",
     "crates/*",
@@ -153,7 +152,7 @@ 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-impl = { path = "derive-impl", version = "0.4.0" }
+rustpython-derive-impl = { path = "crates/derive-impl", version = "0.4.0" }
 rustpython-jit = { path = "jit", version = "0.4.0" }
 rustpython-literal = { path = "compiler/literal", version = "0.4.0" }
 rustpython-vm = { path = "vm", default-features = false, version = "0.4.0" }
diff --git a/derive-impl/Cargo.toml b/crates/derive-impl/Cargo.toml
similarity index 100%
rename from derive-impl/Cargo.toml
rename to crates/derive-impl/Cargo.toml
diff --git a/derive-impl/src/compile_bytecode.rs b/crates/derive-impl/src/compile_bytecode.rs
similarity index 100%
rename from derive-impl/src/compile_bytecode.rs
rename to crates/derive-impl/src/compile_bytecode.rs
diff --git a/derive-impl/src/error.rs b/crates/derive-impl/src/error.rs
similarity index 100%
rename from derive-impl/src/error.rs
rename to crates/derive-impl/src/error.rs
diff --git a/derive-impl/src/from_args.rs b/crates/derive-impl/src/from_args.rs
similarity index 100%
rename from derive-impl/src/from_args.rs
rename to crates/derive-impl/src/from_args.rs
diff --git a/derive-impl/src/lib.rs b/crates/derive-impl/src/lib.rs
similarity index 100%
rename from derive-impl/src/lib.rs
rename to crates/derive-impl/src/lib.rs
diff --git a/derive-impl/src/pyclass.rs b/crates/derive-impl/src/pyclass.rs
similarity index 100%
rename from derive-impl/src/pyclass.rs
rename to crates/derive-impl/src/pyclass.rs
diff --git a/derive-impl/src/pymodule.rs b/crates/derive-impl/src/pymodule.rs
similarity index 100%
rename from derive-impl/src/pymodule.rs
rename to crates/derive-impl/src/pymodule.rs
diff --git a/derive-impl/src/pypayload.rs b/crates/derive-impl/src/pypayload.rs
similarity index 100%
rename from derive-impl/src/pypayload.rs
rename to crates/derive-impl/src/pypayload.rs
diff --git a/derive-impl/src/pystructseq.rs b/crates/derive-impl/src/pystructseq.rs
similarity index 100%
rename from derive-impl/src/pystructseq.rs
rename to crates/derive-impl/src/pystructseq.rs
diff --git a/derive-impl/src/pytraverse.rs b/crates/derive-impl/src/pytraverse.rs
similarity index 100%
rename from derive-impl/src/pytraverse.rs
rename to crates/derive-impl/src/pytraverse.rs
diff --git a/derive-impl/src/util.rs b/crates/derive-impl/src/util.rs
similarity index 100%
rename from derive-impl/src/util.rs
rename to crates/derive-impl/src/util.rs

From a913127a79d7708b70d68b67a7cb1240442de21e Mon Sep 17 00:00:00 2001
From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com>
Date: Sat, 15 Nov 2025 10:22:14 +0200
Subject: [PATCH 2/2] bad merge fix

---
 Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index a722a3d7a86..f5cdaa096f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -129,7 +129,6 @@ members = [
     "vm",
     "vm/sre_engine",
     "stdlib",
-    "wtf8",
     "wasm/lib",
     "crates/*",
 ]