Use format and cformat from rustpython-literal (RustPython#4968)

* Use `format` and `cformat` from `rustpython-literal`

* Remove unused dependencies, use `rustpython-format`

Author: MichaReiser

Cargo.lock

@@ -29,14 +29,16 @@ rustpython-pylib = { path = "pylib" }
 rustpython-stdlib = { path = "stdlib" }
 rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" }
 
-rustpython-literal = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
-rustpython-parser-core = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
-rustpython-parser = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
-rustpython-ast = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
-# 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-literal = { git = "https://github.com/RustPython/Parser.git", rev = "a983f4383fb1ad8c1c66acb1d5b0016e59f95a49" }
+rustpython-parser-core = { git = "https://github.com/RustPython/Parser.git", rev = "a983f4383fb1ad8c1c66acb1d5b0016e59f95a49" }
+rustpython-parser = { git = "https://github.com/RustPython/Parser.git", rev = "a983f4383fb1ad8c1c66acb1d5b0016e59f95a49" }
+rustpython-ast = { git = "https://github.com/RustPython/Parser.git", rev = "a983f4383fb1ad8c1c66acb1d5b0016e59f95a49" }
+rustpython-format = { git = "https://github.com/RustPython/Parser.git", rev = "a983f4383fb1ad8c1c66acb1d5b0016e59f95a49" }
+#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.7.6"
 anyhow = "1.0.45"

Cargo.toml

@@ -11,7 +11,7 @@ license = "MIT"
 threading = ["parking_lot"]
 
 [dependencies]
-rustpython-literal = { workspace = true }
+rustpython-format = { workspace = true }
 
 ascii = { workspace = true }
 bitflags = { workspace = true }
@@ -20,7 +20,6 @@ cfg-if = { workspace = true }
 itertools = { workspace = true }
 libc = { workspace = true }
 num-bigint = { workspace = true }
-num-complex = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { workspace = true }
 parking_lot = { workspace = true, optional = true }