From 1a97620ff9b8423665e7dee7f345f9c6c9106570 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Sat, 15 Nov 2025 11:07:36 +0200 Subject: [PATCH 1/2] Move `compiler/src` -> `crates/compiler` --- Cargo.toml | 3 +-- {compiler => crates/compiler}/Cargo.toml | 0 {compiler => crates/compiler}/src/lib.rs | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename {compiler => crates/compiler}/Cargo.toml (100%) rename {compiler => crates/compiler}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index d3bcfc88f19..76a1b2777b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -121,7 +121,6 @@ template = "installer-config/installer.wxs" [workspace] resolver = "2" members = [ - "compiler", "compiler/codegen", ".", "derive", @@ -144,7 +143,7 @@ license = "MIT" [workspace.dependencies] rustpython-compiler-core = { path = "crates/compiler-core", version = "0.4.0" } -rustpython-compiler = { path = "compiler", version = "0.4.0" } +rustpython-compiler = { path = "crates/compiler", version = "0.4.0" } rustpython-codegen = { path = "compiler/codegen", version = "0.4.0" } rustpython-common = { path = "crates/common", version = "0.4.0" } rustpython-derive = { path = "derive", version = "0.4.0" } diff --git a/compiler/Cargo.toml b/crates/compiler/Cargo.toml similarity index 100% rename from compiler/Cargo.toml rename to crates/compiler/Cargo.toml diff --git a/compiler/src/lib.rs b/crates/compiler/src/lib.rs similarity index 100% rename from compiler/src/lib.rs rename to crates/compiler/src/lib.rs From c8bac82822a0c8151281b32d8ab6a407f7f00366 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Sat, 15 Nov 2025 11:33:00 +0200 Subject: [PATCH 2/2] Fix bad merge --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f1f26f65619..639c11f2fc4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -121,7 +121,6 @@ template = "installer-config/installer.wxs" [workspace] resolver = "2" members = [ - "compiler/codegen", ".", "derive", "vm",