Skip to content

common dependency in workspace #5624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 2 commits into from
Mar 27, 2025
Merged

common dependency in workspace #5624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3e7273
libffi in workspace
youknowone Mar 26, 2025
ba0bb06
Retrieve more common dependency to workspace
youknowone Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ itertools = "0.14.0"
is-macro = "0.3.7"
junction = "1.2.0"
libc = "0.2.169"
libffi = "3.2"
Comment thread
youknowone marked this conversation as resolved.
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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion compiler/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion compiler/literal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions derive-impl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
5 changes: 1 addition & 4 deletions jit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
14 changes: 7 additions & 7 deletions stdlib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions vm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion vm/sre_engine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down