Merge pull request RustPython#5624 from youknowone/libffi-workspace

youknowone · web-flow · commit f27c1f7ea330 · 2025-03-27T14:51:47.000+09:00
common dependency in workspace
diff --git a/Cargo.toml b/Cargo.toml
@@ -167,6 +167,7 @@ itertools = "0.14.0"
 is-macro = "0.3.7"
 junction = "1.2.0"
 libc = "0.2.169"
+libffi = "3.2"
 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.5"
@@ -177,9 +178,12 @@ num-complex = "0.4.6"
 num-integer = "0.1.46"
 num-traits = "0.2"
 num_enum = { version = "0.7", default-features = false }
+optional = "0.5"
 once_cell = "1.20.3"
 parking_lot = "0.12.3"
 paste = "1.0.15"
+proc-macro2 = "1.0.93"
+quote = "1.0.38"
 rand = "0.9"
 rustix = { version = "0.38", features = ["event"] }
 rustyline = "15.0.0"
@@ -191,6 +195,13 @@ strum_macros = "0.27"
 syn = "2"
 thiserror = "2.0"
 thread_local = "1.1.8"
+unicode-casing = "0.1.0"
+unic-char-property = "0.9.0"
+unic-normal = "0.9.0"
+unic-ucd-age = "0.9.0"
+unic-ucd-bidi = "0.9.0"
+unic-ucd-category = "0.9.0"
+unic-ucd-ident = "0.9.0"
 unicode_names2 = "1.3.0"
 widestring = "1.1.0"
 windows-sys = "0.59.0"
diff --git a/compiler/core/Cargo.toml b/compiler/core/Cargo.toml
@@ -18,7 +18,7 @@ bitflags = { workspace = true }
 itertools = { workspace = true }
 malachite-bigint = { workspace = true }
 num-complex = { workspace = true }
-serde = { version = "1.0.217", optional = true, default-features = false, features = ["derive"] }
+serde = { workspace = true, optional = true, default-features = false, features = ["derive"] }
 
 lz4_flex = "0.11"
 
diff --git a/compiler/literal/Cargo.toml b/compiler/literal/Cargo.toml
@@ -13,7 +13,7 @@ hexf-parse = "0.2.1"
 is-macro.workspace = true
 lexical-parse-float = { version = "0.8.0", features = ["format"] }
 num-traits = { workspace = true }
-unic-ucd-category = "0.9"
+unic-ucd-category = { workspace = true }
 
 [dev-dependencies]
 rand = { workspace = true }
diff --git a/derive-impl/Cargo.toml b/derive-impl/Cargo.toml
@@ -17,8 +17,8 @@ itertools = { workspace = true }
 syn = { workspace = true, features = ["full", "extra-traits"] }
 
 maplit = "1.0.2"
-proc-macro2 = "1.0.93"
-quote = "1.0.38"
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
 syn-ext = { version = "0.5.0", features = ["full"] }
 textwrap = { version = "0.16.1", default-features = false }
 
diff --git a/jit/Cargo.toml b/jit/Cargo.toml
@@ -15,15 +15,12 @@ rustpython-compiler-core = { workspace = true }
 
 num-traits = { workspace = true }
 thiserror = { workspace = true }
+libffi = { workspace = true, features = ["system"] }
 
 cranelift = "0.116.1"
 cranelift-jit = "0.116.1"
 cranelift-module = "0.116.1"
 
-[dependencies.libffi]
-version = "3.1.0"
-features = ["system"]
-
 [dev-dependencies]
 rustpython-derive = { path = "../derive", version = "0.4.0" }
 
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -65,14 +65,14 @@ blake2 = "0.10.4"
 unicode_names2 = { workspace = true }
 # TODO: use unic for this; needed for title case:
 # https://github.com/RustPython/RustPython/pull/832#discussion_r275428939
-unicode-casing = "0.1.0"
+unicode-casing = { workspace = true }
 # update version all at the same time
-unic-char-property = "0.9.0"
-unic-normal        = "0.9.0"
-unic-ucd-bidi      = "0.9.0"
-unic-ucd-category  = "0.9.0"
-unic-ucd-age       = "0.9.0"
-unic-ucd-ident     = "0.9.0"
+unic-char-property = { workspace = true }
+unic-normal        = { workspace = true }
+unic-ucd-bidi      = { workspace = true }
+unic-ucd-category  = { workspace = true }
+unic-ucd-age       = { workspace = true }
+unic-ucd-ident     = { workspace = true }
 ucd = "0.1.1"
 
 # compression
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -81,19 +81,19 @@ caseless = "0.2.2"
 flamer = { version = "0.4", optional = true }
 half = "2"
 memoffset = "0.9.1"
-optional = "0.5.0"
+optional = { workspace = true }
 result-like = "0.5.0"
 timsort = "0.1.2"
 
 ## unicode stuff
 unicode_names2 = { workspace = true }
 # TODO: use unic for this; needed for title case:
 # https://github.com/RustPython/RustPython/pull/832#discussion_r275428939
-unicode-casing = "0.1.0"
+unicode-casing = { workspace = true }
 # update version all at the same time
-unic-ucd-bidi = "0.9.0"
-unic-ucd-category = "0.9.0"
-unic-ucd-ident = "0.9.0"
+unic-ucd-bidi = { workspace = true }
+unic-ucd-category = { workspace = true }
+unic-ucd-ident = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 rustix = { workspace = true }
@@ -107,7 +107,7 @@ errno = "0.3"
 widestring = { workspace = true }
 
 [target.'cfg(all(any(target_os = "linux", target_os = "macos", target_os = "windows"), not(any(target_env = "musl", target_env = "sgx"))))'.dependencies]
-libffi = "3.2"
+libffi = { workspace = true, features = ["system"] }
 libloading = "0.8"
 
 [target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies]
diff --git a/vm/sre_engine/Cargo.toml b/vm/sre_engine/Cargo.toml
@@ -18,7 +18,7 @@ harness = false
 rustpython-common = { workspace = true }
 num_enum = { workspace = true }
 bitflags = { workspace = true }
-optional = "0.5"
+optional = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true }
