From 16a242f62c5437dccee0e9cd0758cf57ec1c4f0b Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 14 Nov 2025 19:21:34 +0200 Subject: [PATCH 1/2] Move `compiler/literal` -> `crates/compiler-literal` --- Cargo.toml | 3 +-- {compiler/literal => crates/compiler-literal}/Cargo.toml | 0 {compiler/literal => crates/compiler-literal}/src/char.rs | 0 {compiler/literal => crates/compiler-literal}/src/complex.rs | 0 {compiler/literal => crates/compiler-literal}/src/escape.rs | 0 {compiler/literal => crates/compiler-literal}/src/float.rs | 0 {compiler/literal => crates/compiler-literal}/src/format.rs | 0 {compiler/literal => crates/compiler-literal}/src/lib.rs | 0 8 files changed, 1 insertion(+), 2 deletions(-) rename {compiler/literal => crates/compiler-literal}/Cargo.toml (100%) rename {compiler/literal => crates/compiler-literal}/src/char.rs (100%) rename {compiler/literal => crates/compiler-literal}/src/complex.rs (100%) rename {compiler/literal => crates/compiler-literal}/src/escape.rs (100%) rename {compiler/literal => crates/compiler-literal}/src/float.rs (100%) rename {compiler/literal => crates/compiler-literal}/src/format.rs (100%) rename {compiler/literal => crates/compiler-literal}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index b01734ae7ae..2b957616755 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -124,7 +124,6 @@ members = [ "compiler", "compiler/core", "compiler/codegen", - "compiler/literal", ".", "common", "derive", @@ -155,7 +154,7 @@ 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-jit = { path = "jit", version = "0.4.0" } -rustpython-literal = { path = "compiler/literal", version = "0.4.0" } +rustpython-literal = { path = "crates/compiler-literal", version = "0.4.0" } rustpython-vm = { path = "vm", default-features = false, version = "0.4.0" } rustpython-pylib = { path = "pylib", version = "0.4.0" } rustpython-stdlib = { path = "stdlib", default-features = false, version = "0.4.0" } diff --git a/compiler/literal/Cargo.toml b/crates/compiler-literal/Cargo.toml similarity index 100% rename from compiler/literal/Cargo.toml rename to crates/compiler-literal/Cargo.toml diff --git a/compiler/literal/src/char.rs b/crates/compiler-literal/src/char.rs similarity index 100% rename from compiler/literal/src/char.rs rename to crates/compiler-literal/src/char.rs diff --git a/compiler/literal/src/complex.rs b/crates/compiler-literal/src/complex.rs similarity index 100% rename from compiler/literal/src/complex.rs rename to crates/compiler-literal/src/complex.rs diff --git a/compiler/literal/src/escape.rs b/crates/compiler-literal/src/escape.rs similarity index 100% rename from compiler/literal/src/escape.rs rename to crates/compiler-literal/src/escape.rs diff --git a/compiler/literal/src/float.rs b/crates/compiler-literal/src/float.rs similarity index 100% rename from compiler/literal/src/float.rs rename to crates/compiler-literal/src/float.rs diff --git a/compiler/literal/src/format.rs b/crates/compiler-literal/src/format.rs similarity index 100% rename from compiler/literal/src/format.rs rename to crates/compiler-literal/src/format.rs diff --git a/compiler/literal/src/lib.rs b/crates/compiler-literal/src/lib.rs similarity index 100% rename from compiler/literal/src/lib.rs rename to crates/compiler-literal/src/lib.rs From d92303b06d472330023732bec25fde68b0e30868 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 14 Nov 2025 19:33:33 +0200 Subject: [PATCH 2/2] Use correct crate name --- Cargo.toml | 2 +- crates/{compiler-literal => literal}/Cargo.toml | 0 crates/{compiler-literal => literal}/src/char.rs | 0 crates/{compiler-literal => literal}/src/complex.rs | 0 crates/{compiler-literal => literal}/src/escape.rs | 0 crates/{compiler-literal => literal}/src/float.rs | 0 crates/{compiler-literal => literal}/src/format.rs | 0 crates/{compiler-literal => literal}/src/lib.rs | 0 8 files changed, 1 insertion(+), 1 deletion(-) rename crates/{compiler-literal => literal}/Cargo.toml (100%) rename crates/{compiler-literal => literal}/src/char.rs (100%) rename crates/{compiler-literal => literal}/src/complex.rs (100%) rename crates/{compiler-literal => literal}/src/escape.rs (100%) rename crates/{compiler-literal => literal}/src/float.rs (100%) rename crates/{compiler-literal => literal}/src/format.rs (100%) rename crates/{compiler-literal => literal}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 2b957616755..3f23fc11a75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -154,7 +154,7 @@ 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-jit = { path = "jit", version = "0.4.0" } -rustpython-literal = { path = "crates/compiler-literal", version = "0.4.0" } +rustpython-literal = { path = "crates/literal", version = "0.4.0" } rustpython-vm = { path = "vm", default-features = false, version = "0.4.0" } rustpython-pylib = { path = "pylib", version = "0.4.0" } rustpython-stdlib = { path = "stdlib", default-features = false, version = "0.4.0" } diff --git a/crates/compiler-literal/Cargo.toml b/crates/literal/Cargo.toml similarity index 100% rename from crates/compiler-literal/Cargo.toml rename to crates/literal/Cargo.toml diff --git a/crates/compiler-literal/src/char.rs b/crates/literal/src/char.rs similarity index 100% rename from crates/compiler-literal/src/char.rs rename to crates/literal/src/char.rs diff --git a/crates/compiler-literal/src/complex.rs b/crates/literal/src/complex.rs similarity index 100% rename from crates/compiler-literal/src/complex.rs rename to crates/literal/src/complex.rs diff --git a/crates/compiler-literal/src/escape.rs b/crates/literal/src/escape.rs similarity index 100% rename from crates/compiler-literal/src/escape.rs rename to crates/literal/src/escape.rs diff --git a/crates/compiler-literal/src/float.rs b/crates/literal/src/float.rs similarity index 100% rename from crates/compiler-literal/src/float.rs rename to crates/literal/src/float.rs diff --git a/crates/compiler-literal/src/format.rs b/crates/literal/src/format.rs similarity index 100% rename from crates/compiler-literal/src/format.rs rename to crates/literal/src/format.rs diff --git a/crates/compiler-literal/src/lib.rs b/crates/literal/src/lib.rs similarity index 100% rename from crates/compiler-literal/src/lib.rs rename to crates/literal/src/lib.rs