8000 Merge pull request #5624 from youknowone/libffi-workspace · RustPython/RustPython@f27c1f7 · GitHub
[go: up one dir, main page]
Skip to content

Commit f27c1f7

Browse files
youknowoneyouknowone
authored
Merge pull request #5624 from youknowone/libffi-workspace
common dependency in workspace
1 parent c7ca173 commit f27c1f7

File tree

8 files changed

+30
-22
lines changed

8 files changed

+30
-22
lines changed

‎Cargo.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ itertools = "0.14.0"
167167
is-macro = "0.3.7"
168168
junction = "1.2.0"
169169
libc = "0.2.169"
170+
libffi = "3.2"
170171
log = "0.4.25"
171172
nix = { version = "0.29", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] }
172173
malachite-bigint = "0.5"
@@ -177,9 +178,12 @@ num-complex = "0.4.6"
177178
num-integer = "0.1.46"
178179
num-traits = "0.2"
179180
num_enum = { version = "0.7", default-features = false }
181+
optional = "0.5"
180182
once_cell = "1.20.3"
181183
parking_lot = "0.12.3"
182184
paste = "1.0.15"
185+
proc-macro2 = "1.0.93"
186+
quote = "1.0.38"
183187
rand = "0.9"
184188
rustix = { version = "0.38", features = ["event"] }
185189
rustyline = "15.0.0"
@@ -191,6 +195,13 @@ strum_macros = "0.27"
191195
syn = "2"
192196
thiserror = "2.0"
193197
thread_local = "1.1.8"
198+
unicode-casing = "0.1.0"
199+
unic-char-property = "0.9.0"
200+
unic-normal = "0.9.0"
201+
unic-ucd-age = "0.9.0"
202+
unic-ucd-bidi = "0.9.0"
203+
unic-ucd-category = "0.9.0"
204+
unic-ucd-ident = "0.9.0"
194205
unicode_names2 = "1.3.0"
195206
widestring = "1.1.0"
196207
windows-sys = "0.59.0"

‎compiler/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ bitflags = { workspace = true }
1818
itertools = { workspace = true }
1919
malachite-bigint = { workspace = true }
2020
num-complex = { workspace = true }
21-
serde = { version = "1.0.217", optional = true, default-features = false, features = ["derive"] }
21+
serde = { workspace = true, optional = true, default-features = false, features = ["derive"] }
2222

2323
lz4_flex = "0.11"
2424

‎compiler/literal/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ hexf-parse = "0.2.1"
1313
is-macro.workspace = true
1414
lexical-parse-float = { version = "0.8.0", features = ["format"] }
1515
num-traits = { workspace = true }
16-
unic-ucd-category = "0.9"
16+
unic-ucd-category = { workspace = true }
1717

1818
[dev-dependencies]
1919
rand = { workspace = true }

‎derive-impl/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ itertools = { workspace = true }
1717
syn = { workspace = true, features = ["full", "extra-traits"] }
1818

1919
maplit = "1.0.2"
20-
proc-macro2 = "1.0.93"
21-
quote = "1.0.38"
20+
proc-macro2 = { workspace = true }
21+
quote = { workspace = true }
2222
syn-ext = { version = "0.5.0", features = ["full"] }
2323
textwrap = { version = "0.16.1", default-features = false }
2424

‎jit/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@ rustpython-compiler-core = { workspace = true }
1515

1616
num-traits = { workspace = true }
1717
thiserror = { workspace = true }
18+
libffi = { workspace = true, features = ["system"] }
1819

1920
cranelift = "0.116.1"
2021
cranelift-jit = "0.116.1"
2122
cranelift-module = "0.116.1"
2223

23-
[dependencies.libffi]
24-
version = "3.1.0"
25-
features = ["system"]
26-
2724
[dev-dependencies]
2825
rustpython-derive = { path = "../derive", version = "0.4.0" }
2926

‎stdlib/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ blake2 = "0.10.4"
6565
unicode_names2 = { workspace = true }
6666
# TODO: use unic for this; needed for title case:
6767
# https://github.com/RustPython/RustPython/pull/832#discussion_r275428939
68-
unicode-casing = "0.1.0"
68+
unicode-casing = { workspace = true }
6969
# update version all at the same time
70-
unic-char-property = "0.9.0"
71-
unic-normal = "0.9.0"
72-
unic-ucd-bidi = "0.9.0"
73-
unic-ucd-category = "0.9.0"
74-
unic-ucd-age = "0.9.0"
75-
unic-ucd-ident = "0.9.0"
70+
unic-char-property = { workspac F438 e = true }
71+
unic-normal = { workspace = true }
72+
unic-ucd-bidi = { workspace = true }
73+
unic-ucd-category = { workspace = true }
74+
unic-ucd-age = { workspace = true }
75+
unic-ucd-ident = { workspace = true }
7676
ucd = "0.1.1"
7777

7878
# compression

‎vm/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,19 @@ caseless = "0.2.2"
8181
flamer = { version = "0.4", optional = true }
8282
half = "2"
8383
memoffset = "0.9.1"
84-
optional = "0.5.0"
84+
optional = { workspace = true }
8585
result-like = "0.5.0"
8686
timsort = "0.1.2"
8787

8888
## unicode stuff
8989
unicode_names2 = { workspace = true }
9090
# TODO: use unic for this; needed for title case:
9191
# https://github.com/RustPython/RustPython/pull/832#discussion_r275428939
92-
unicode-casing = "0.1.0"
92+
unicode-casing = { workspace = true }
9393
# update version all at the same time
94-
unic-ucd-bidi = "0.9.0"
95-
unic-ucd-category = "0.9.0"
96-
unic-ucd-ident = "0.9.0"
94+
unic-ucd-bidi = { workspace = true }
95+
unic-ucd-category = { workspace = true }
96+
unic-ucd-ident = { workspace = true }
9797

9898
[target.'cfg(unix)'.dependencies]
9999
rustix = { workspace = true }
@@ -107,7 +107,7 @@ errno = "0.3"
107107
widestring = { workspace = true }
108108

109109
[target.'cfg(all(any(target_os = "linux", target_os = "macos", target_os = "windows"), not(any(target_env = "musl", target_env = "sgx"))))'.dependencies]
110-
libffi = "3.2"
110+
libffi = { workspace = true, features = ["system"] }
111111
libloading = "0.8"
112112

113113
[target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies]

‎vm/sre_engine/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ harness = false
1818
rustpython-common = { workspace = true }
1919
num_enum = { workspace = true }
2020
bitflags = { workspace = true }
21-
optional = "0.5"
21+
optional = { workspace = true }
2222

2323
[dev-dependencies]
2424
criterion = { workspace = true }

0 commit comments

Comments
 (0)
0