Merge format and literal back into this repo (and update malachite) (RustPython#5618)

* Merge format and literal back into this repo

* Update format and literal to work

* Update malachite

* Remove RustPython/Parser from Cargo.toml

Author: coolreader18

Cargo.lock

@@ -94,7 +94,7 @@ x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md", dev-dependencies =
 [workspace]
 resolver = "2"
 members = [
-    "compiler", "compiler/core", "compiler/codegen", "compiler/source",
+    "compiler", "compiler/core", "compiler/codegen", "compiler/literal", "compiler/source",
     ".", "common", "derive", "jit", "vm", "vm/sre_engine", "pylib", "stdlib", "derive-impl",
     "wasm/lib",
 ]
@@ -116,6 +116,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-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" }
@@ -127,21 +128,6 @@ ruff_python_ast = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0
 ruff_text_size = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0" }
 ruff_source_file = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0" }
 ruff_python_codegen = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0" }
-# rustpython-literal = { version = "0.4.0" }
-# rustpython-parser-core = { version = "0.4.0" }
-# rustpython-parser = { version = "0.4.0" }
-# rustpython-ast = { version = "0.4.0" }
-# rustpython-format= { version = "0.4.0" }
-rustpython-literal = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "d2f137b372ec08ce4a243564a80f8f9153c45a23" }
-# rustpython-parser-core = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "d2f137b372ec08ce4a243564a80f8f9153c45a23" }
-# rustpython-parser = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "d2f137b372ec08ce4a243564a80f8f9153c45a23" }
-# rustpython-ast = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "d2f137b372ec08ce4a243564a80f8f9153c45a23" }
-rustpython-format = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "d2f137b372ec08ce4a243564a80f8f9153c45a23" }
-# rustpython-literal = { path = "../RustPython-parser/literal" }
-# rustpython-parser-core = { path = "../RustPython-parser/core" }
-# rustpython-parser = { path = "../RustPython-parser/parser" }
-# rustpython-ast = { path = "../RustPython-parser/ast" }
-# rustpython-format = { path = "../RustPython-parser/format" }
 
 ahash = "0.8.11"
 ascii = "1.1"
@@ -163,9 +149,9 @@ junction = "1.2.0"
 libc = "0.2.169"
 log = "0.4.25"
 nix = { version = "0.29", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] }
-malachite-bigint = "0.2.3"
-malachite-q = "0.4.22"
-malachite-base = "0.4.22"
+malachite-bigint = "0.5"
+malachite-q = "0.5"
+malachite-base = "0.5"
 memchr = "2.7.4"
 num-complex = "0.4.6"
 num-integer = "0.1.46"

Cargo.toml

@@ -12,7 +12,7 @@ license.workspace = true
 threading = ["parking_lot"]
 
 [dependencies]
-rustpython-format = { workspace = true }
+rustpython-literal = { workspace = true }
 
 ascii = { workspace = true }
 bitflags = { workspace = true }
@@ -45,4 +45,4 @@ windows-sys = { workspace = true, features = [
 ] }
 
 [lints]
-workspace = true
+workspace = true