Skip to content

Commit 42a22c2

Browse files
committed
use workspace dependencies
1 parent adc2325 commit 42a22c2

File tree

15 files changed

+176
-141
lines changed

15 files changed

+176
-141
lines changed

Cargo.lock

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 48 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,45 @@ members = [
1818
".", "common", "derive", "jit", "vm", "pylib", "stdlib", "wasm/lib", "derive-impl",
1919
]
2020

21+
[workspace.dependencies]
22+
ahash = "0.7.6"
23+
anyhow = "1.0.45"
24+
ascii = "1.0"
25+
atty = "0.2.14"
26+
bincode = "1.3.3"
27+
bitflags = "1.3.2"
28+
bstr = "0.2.17"
29+
cfg-if = "1.0"
30+
chrono = "0.4.19"
31+
crossbeam-utils = "0.8.9"
32+
flame = "0.2.2"
33+
glob = "0.3"
34+
hex = "0.4.3"
35+
indexmap = "1.8.1"
36+
insta = "1.14.0"
37+
itertools = "0.10.3"
38+
libc = "0.2.133"
39+
log = "0.4.16"
40+
nix = "0.24"
41+
num-complex = "0.4.0"
42+
num-bigint = "0.4.3"
43+
num-integer = "0.1.44"
44+
num-rational = "0.4.0"
45+
num-traits = "0.2"
46+
num_enum = "0.5.7"
47+
once_cell = "1.13"
48+
parking_lot = "0.12"
49+
paste = "1.0.7"
50+
rand = "0.8.5"
51+
rustyline = "10.0.0"
52+
serde = "1.0"
53+
schannel = "0.1.19"
54+
static_assertions = "1.1"
55+
syn = "1.0.91"
56+
thiserror = "1.0"
57+
thread_local = "1.1.4"
58+
widestring = "0.5.1"
59+
2160
[features]
2261
default = ["threading", "stdlib", "zlib", "importlib", "encodings", "rustpython-parser/lalrpop"]
2362
importlib = ["rustpython-vm/importlib"]
@@ -39,19 +78,21 @@ rustpython-pylib = { path = "pylib", optional = true, default-features = false }
3978
rustpython-stdlib = { path = "stdlib", optional = true, default-features = false }
4079
rustpython-vm = { path = "vm", version = "0.2.0", default-features = false, features = ["compiler"] }
4180

42-
cfg-if = "1.0.0"
81+
atty = { workspace = true }
82+
cfg-if = { workspace = true }
83+
log = { workspace = true }
84+
flame = { workspace = true, optional = true }
85+
4386
clap = "2.34"
4487
dirs = { package = "dirs-next", version = "2.0.0" }
4588
env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] }
46-
flame = { version = "0.2.2", optional = true }
4789
flamescope = { version = "0.1.2", optional = true }
48-
libc = "0.2.133"
49-
log = "0.4.16"
50-
num-traits = "0.2.14"
51-
atty = "0.2.14"
90+
91+
[target.'cfg(windows)'.dependencies]
92+
libc = { workspace = true }
5293

5394
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
54-
rustyline = "10.0.0"
95+
rustyline = { workspace = true }
5596

5697
[dev-dependencies]
5798
cpython = "0.7.0"

common/Cargo.toml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,25 @@ license = "MIT"
1111
threading = ["parking_lot"]
1212

1313
[dependencies]
14-
ascii = "1.0"
15-
bitflags = "1.3.2"
16-
cfg-if = "1.0"
14+
ascii = { workspace = true }
15+
bitflags = { workspace = true }
16+
cfg-if = { workspace = true }
17+
itertools = { workspace = true }
18+
libc = { workspace = true }
19+
num-bigint = { workspace = true }
20+
num-complex = { workspace = true }
21+
num-traits = { workspace = true }
22+
once_cell = { workspace = true }
23+
parking_lot = { workspace = true, optional = true }
24+
rand = { workspace = true }
25+
1726
hexf-parse = "0.2.1"
18-
itertools = "0.10.3"
1927
lexical-parse-float = { version = "0.8.0", features = ["format"] }
20-
libc = "0.2.133"
2128
lock_api = "0.4"
22-
num-bigint = "0.4.2"
23-
num-complex = "0.4.0"
24-
num-traits = "0.2"
25-
once_cell = "1.4.1"
26-
parking_lot = { version = "0.12.0", optional = true }
2729
radium = "0.7"
28-
rand = "0.8"
2930
siphasher = "0.3"
3031
unic-ucd-category = "0.9"
3132
volatile = "0.3"
3233

3334
[target.'cfg(windows)'.dependencies]
34-
widestring = "0.5.1"
35+
widestring = { workspace = true }

compiler/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ rustpython-compiler-core = { path = "core" }
1010
rustpython-codegen = { path = "codegen" }
1111
rustpython-parser = { path = "parser" }
1212

13-
thiserror = "1.0"
13+
thiserror = { workspace = true }

compiler/ast/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ fold = []
1414
unparse = ["rustpython-common"]
1515

1616
[dependencies]
17-
num-bigint = "0.4.3"
1817
rustpython-compiler-core = { path = "../core", version = "0.2.0" }
1918
rustpython-common = { path = "../../common", version = "0.2.0", optional = true }
19+
20+
num-bigint = { workspace = true }

compiler/codegen/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ edition = "2021"
1111
rustpython-ast = { path = "../ast", features = ["unparse"] }
1212
rustpython-compiler-core = { path = "../core", version = "0.2.0" }
1313

14-
ahash = "0.7.6"
15-
bitflags = "1.3.2"
16-
indexmap = "1.8.1"
17-
itertools = "0.10.3"
18-
log = "0.4.16"
19-
num-complex = { version = "0.4.0", features = ["serde"] }
20-
num-traits = "0.2.14"
21-
thiserror = "1.0"
14+
ahash = { workspace = true }
15+
bitflags = { workspace = true }
16+
indexmap = { workspace = true }
17+
itertools = { workspace = true }
18+
log = { workspace = true }
19+
num-complex = { workspace = true, features = ["serde"] }
20+
num-traits = { workspace = true }
21+
thiserror = { workspace = true }
2222

2323
[dev-dependencies]
2424
rustpython-parser = { path = "../parser" }
2525

26-
insta = "1.14.0"
26+
insta = { workspace = true }

compiler/core/Cargo.toml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ repository = "https://github.com/RustPython/RustPython"
88
license = "MIT"
99

1010
[dependencies]
11-
bincode = "1.3.3"
12-
bitflags = "1.3.2"
13-
bstr = "0.2.17"
14-
itertools = "0.10.3"
11+
bincode = { workspace = true }
12+
bitflags = { workspace = true }
13+
bstr = { workspace = true }
14+
itertools = { workspace = true }
15+
num-bigint = { workspace = true, features = ["serde"] }
16+
num-complex = { workspace = true, features = ["serde"] }
17+
num_enum = { workspace = true }
18+
serde = { workspace = true, features = ["derive"] }
19+
thiserror = { workspace = true }
20+
1521
lz4_flex = "0.9.2"
16-
num-bigint = { version = "0.4.3", features = ["serde"] }
17-
num-complex = { version = "0.4.0", features = ["serde"] }
18-
num_enum = "0.5.7"
19-
serde = { version = "1.0.136", features = ["derive"] }
20-
thiserror = "1.0"

compiler/parser/Cargo.toml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ edition = "2021"
1212
default = ["lalrpop"] # removing this causes potential build failure
1313

1414
[build-dependencies]
15-
anyhow = "1.0.45"
15+
anyhow = { workspace = true }
1616
lalrpop = { version = "0.19.8", optional = true }
1717
phf_codegen = "0.11.1"
1818
tiny-keccak = { version = "2", features = ["sha3"] }
@@ -21,18 +21,19 @@ tiny-keccak = { version = "2", features = ["sha3"] }
2121
rustpython-ast = { path = "../ast", version = "0.2.0" }
2222
rustpython-compiler-core = { path = "../core", version = "0.2.0" }
2323

24-
ahash = "0.7.6"
25-
itertools = "0.10.3"
26-
lalrpop-util = "0.19.8"
27-
log = "0.4.16"
28-
num-bigint = "0.4.3"
29-
num-traits = "0.2.14"
30-
phf = "0.11.1"
31-
rustc-hash = "1.1.0"
32-
thiserror = "1.0"
24+
ahash = { workspace = true }
25+
itertools = { workspace = true }
26+
log = { workspace = true }
27+
num-bigint = { workspace = true }
28+
num-traits = { workspace = true }
29+
thiserror = { workspace = true }
30+
3331
unic-emoji-char = "0.9.0"
3432
unic-ucd-ident = "0.9.0"
3533
unicode_names2 = "0.5.0"
34+
lalrpop-util = "0.19.8"
35+
phf = "0.11.1"
36+
rustc-hash = "1.1.0"
3637

3738
[dev-dependencies]
38-
insta = "1.14.0"
39+
insta = { workspace = true }

derive-impl/Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ edition = "2021"
77
rustpython-compiler-core = { path = "../compiler/core", version = "0.2.0" }
88
rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" }
99

10-
indexmap = "1.8.1"
11-
itertools = "0.10.3"
10+
indexmap = { workspace = true }
11+
itertools = { workspace = true }
12+
once_cell = { workspace = true }
13+
syn = { workspace = true, features = ["full", "extra-traits"] }
14+
1215
maplit = "1.0.2"
13-
once_cell = "1.10.0"
1416
proc-macro2 = "1.0.37"
1517
quote = "1.0.18"
16-
syn = { version = "1.0.91", features = ["full", "extra-traits"] }
1718
syn-ext = { version = "0.4.0", features = ["full"] }
1819
textwrap = { version = "0.15.0", default-features = false }

derive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ proc-macro = true
1313
[dependencies]
1414
rustpython-compiler = { path = "../compiler", version = "0.2.0" }
1515
rustpython-derive-impl = { path = "../derive-impl" }
16-
syn = "1.0.91"
16+
syn = { workspace = true }

0 commit comments

Comments
 (0)