Skip to content

Commit 7a6000d

Browse files
authored
Use format and cformat from rustpython-literal (RustPython#4968)
* Use `format` and `cformat` from `rustpython-literal` * Remove unused dependencies, use `rustpython-format`
1 parent 15fdf1e commit 7a6000d

File tree

18 files changed

+54
-2287
lines changed

18 files changed

+54
-2287
lines changed

Diff for: Cargo.lock

+21-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+10-8
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@ rustpython-pylib = { path = "pylib" }
2929
rustpython-stdlib = { path = "stdlib" }
3030
rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" }
3131

32-
rustpython-literal = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
33-
rustpython-parser-core = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
34-
rustpython-parser = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
35-
rustpython-ast = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
36-
# rustpython-literal = { path = "../RustPython-parser/literal" }
37-
# rustpython-parser-core = { path = "../RustPython-parser/core" }
38-
# rustpython-parser = { path = "../RustPython-parser/parser" }
39-
# rustpython-ast = { path = "../RustPython-parser/ast" }
32+
rustpython-literal = { git = "https://github.com/RustPython/Parser.git", rev = "a983f4383fb1ad8c1c66acb1d5b0016e59f95a49" }
33+
rustpython-parser-core = { git = "https://github.com/RustPython/Parser.git", rev = "a983f4383fb1ad8c1c66acb1d5b0016e59f95a49" }
34+
rustpython-parser = { git = "https://github.com/RustPython/Parser.git", rev = "a983f4383fb1ad8c1c66acb1d5b0016e59f95a49" }
35+
rustpython-ast = { git = "https://github.com/RustPython/Parser.git", rev = "a983f4383fb1ad8c1c66acb1d5b0016e59f95a49" }
36+
rustpython-format = { git = "https://github.com/RustPython/Parser.git", rev = "a983f4383fb1ad8c1c66acb1d5b0016e59f95a49" }
37+
#rustpython-literal = { path = "../RustPython-parser/literal" }
38+
#rustpython-parser-core = { path = "../RustPython-parser/core" }
39+
#rustpython-parser = { path = "../RustPython-parser/parser" }
40+
#rustpython-ast = { path = "../RustPython-parser/ast" }
41+
#rustpython-format = { path = "../RustPython-parser/format" }
4042

4143
ahash = "0.7.6"
4244
anyhow = "1.0.45"

Diff for: common/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ license = "MIT"
1111
threading = ["parking_lot"]
1212

1313
[dependencies]
14-
rustpython-literal = { workspace = true }
14+
rustpython-format = { workspace = true }
1515

1616
ascii = { workspace = true }
1717
bitflags = { workspace = true }
@@ -20,7 +20,6 @@ cfg-if = { workspace = true }
2020
itertools = { workspace = true }
2121
libc = { workspace = true }
2222
num-bigint = { workspace = true }
23-
num-complex = { workspace = true }
2423
num-traits = { workspace = true }
2524
once_cell = { workspace = true }
2625
parking_lot = { workspace = true, optional = true }

0 commit comments

Comments
 (0)