Skip to content

Commit 80d2d3d

Browse files
authored
chore: move all deps into workspace dependencies (#209)
1 parent d1b78b6 commit 80d2d3d

11 files changed

Lines changed: 155 additions & 144 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,39 @@ cargo = { level = "warn", priority = -1 }
3232
cargo_common_metadata = "allow"
3333

3434
[workspace.dependencies]
35+
allocator-api2 = { version = "0.2.21", default-features = false, features = ["alloc", "std"] }
3536
anyhow = "1.0.98"
37+
arrayvec = "0.7.6"
38+
assert2 = "0.3.16"
39+
assertables = "9.8.1"
40+
attohttpc = "0.29.2"
3641
backon = "1.3.0"
42+
backtrace = "0.3.75"
43+
base64 = "0.22.1"
3744
bincode = "2.0.1"
45+
bindgen = "0.72.1"
46+
blink-alloc = { version = "0.3.1", features = ["sync"] }
3847
brush-parser = "0.2.18"
39-
bstr = "1.12.0"
48+
bstr = { version = "1.12.0", default-features = false, features = ["alloc", "std"] }
49+
bumpalo = { version = "3.17.0", features = ["allocator-api2"] }
50+
bytemuck = { version = "1.23.0", features = ["extern_crate_alloc", "must_cast"] }
51+
bytes = "1.10.1"
4052
cc = "1.2.39"
4153
clap = "4.5.40"
4254
color-eyre = "0.6.5"
4355
compact_str = "0.9.0"
56+
const_format = "0.2.34"
57+
constcat = "0.6.1"
4458
criterion = { version = "0.7", features = ["html_reports"] }
4559
crossterm = { version = "0.29.0", features = ["event-stream"] }
60+
csv-async = { version = "1.3.1", features = ["tokio"] }
61+
ctor = "0.4.2"
4662
dashmap = "6.1.0"
63+
derive-where = "1.4.0"
4764
diff-struct = "0.5.3"
4865
directories = "6.0.0"
4966
edit = "0.1.5"
67+
elf = { version = "0.8.0", default-features = false }
5068
flate2 = "1.0.35"
5169
fspy = { path = "crates/fspy" }
5270
fspy_detours_sys = { path = "crates/fspy_detours_sys" }
@@ -62,19 +80,28 @@ hex = "0.4.3"
6280
httpmock = "0.7"
6381
indoc = "2.0.5"
6482
itertools = "0.14.0"
83+
libc = "0.2.172"
84+
libc-print = "0.1.23"
85+
memmap2 = "0.9.7"
6586
nix = { version = "0.30.1", features = ["dir"] }
87+
ntapi = "0.4.1"
6688
os_str_bytes = "7.1.1"
89+
ouroboros = "0.18.5"
6790
owo-colors = "4.1.0"
6891
passfd = { git = "https://github.com/polachok/passfd", rev = "d55881752c16aced1a49a75f9c428d38d3767213", default-features = false }
92+
path-dedot = "3.1.1"
6993
pathdiff = "0.2.3"
7094
petgraph = "0.8.2"
95+
phf = { version = "0.11.3", features = ["macros"] }
7196
portable-pty = "0.9.0"
97+
rand = "0.9.1"
7298
ratatui = "0.29.0"
7399
rayon = "1.10.0"
74100
ref-cast = "1.0.24"
75101
reqwest = { version = "0.12", features = ["stream", "native-tls", "json"], default-features = false }
76102
rusqlite = "0.37.0"
77103
rustc-hash = "2.1.1"
104+
seccompiler = { git = "https://github.com/branchseer/seccompiler", branch = "seccomp-action-raw" }
78105
semver = "1.0.26"
79106
serde = "1.0.219"
80107
serde_json = "1.0.140"
@@ -83,14 +110,22 @@ serial_test = "3.2.0"
83110
sha1 = "0.10.6"
84111
sha2 = "0.10.9"
85112
shell-escape = "0.1.5"
113+
slab = "0.4.9"
114+
smallvec = { version = "2.0.0-alpha.11", features = ["std"] }
115+
socket2 = "0.5.10"
116+
stackalloc = "1.2.1"
86117
supports-color = "3.0.1"
118+
syscalls = { version = "0.6.18", default-features = false }
87119
tar = "0.4.43"
88120
tempfile = "3.14.0"
89121
test-log = { version = "0.2.18", features = ["trace"] }
90122
thiserror = "2"
123+
thread_local = "1.1.9"
91124
tokio = "1.46.1"
125+
tokio-seqpacket = "0.8.0"
92126
tokio-test = "0.4.4"
93127
tokio-util = "0.7.15"
128+
toml = "0.9.5"
94129
tracing = "0.1.41"
95130
tracing-error = "0.2.1"
96131
tracing-subscriber = { version = "0.3.19", features = ["env-filter", "serde"] }
@@ -104,7 +139,11 @@ vite_path = { path = "crates/vite_path" }
104139
vite_str = { path = "crates/vite_str" }
105140
vite_task = { path = "crates/vite_task" }
106141
wax = "0.6.0"
142+
which = "7.0.3"
143+
widestring = "1.2.0"
107144
winapi = "0.3.9"
145+
winsafe = { version = "0.0.24", features = ["kernel"] }
146+
xxhash-rust = { version = "0.8.15", features = ["const_xxh3"] }
108147

109148
napi = { version = "3.0.0", default-features = false, features = ["async", "error_anyhow"] }
110149
napi-build = "2"

crates/fspy/Cargo.toml

Lines changed: 37 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,77 +5,61 @@ edition = "2024"
55
publish = false
66

77
[dependencies]
8-
rand = "0.9.1"
9-
bincode = "2.0.1"
10-
futures-util = "0.3.31"
11-
libc = "0.2.171"
12-
tempfile = "3.19.1"
13-
# async-send-fd = { version = "1.2.0", features = ["tokio"] }
14-
# passfd = "0.1.6"
15-
tokio = { version = "1.44.2", features = ["net", "process", "io-util", "sync"] }
16-
bumpalo = { version = "3.17.0", features = ["allocator-api2"] }
17-
ouroboros = "0.18.5"
18-
bstr = { version = "1.12.0", default-features = false }
19-
which = "7.0.3"
8+
allocator-api2 = { workspace = true, features = ["alloc"] }
9+
bincode = { workspace = true }
10+
bstr = { workspace = true, default-features = false }
11+
bumpalo = { workspace = true }
2012
fspy_shared = { workspace = true }
21-
slab = "0.4.9"
22-
allocator-api2 = { version = "0.2.21", default-features = false, features = [
23-
"alloc",
24-
] }
13+
futures-util = { workspace = true }
14+
libc = { workspace = true }
15+
ouroboros = { workspace = true }
16+
rand = { workspace = true }
17+
slab = { workspace = true }
18+
tempfile = { workspace = true }
19+
tokio = { workspace = true, features = ["net", "process", "io-util", "sync"] }
20+
which = { workspace = true }
2521

2622
[target.'cfg(target_os = "linux")'.dependencies]
27-
tokio-seqpacket = "0.8.0"
28-
arrayvec = "0.7.6"
29-
nix = { version = "0.30.1", features = ["uio"] }
23+
arrayvec = { workspace = true }
24+
blink-alloc = { workspace = true }
3025
fspy_seccomp_unotify = { workspace = true, features = ["supervisor"] }
31-
blink-alloc = { version = "0.3.1", features = ["sync"] }
32-
thread_local = "1.1.9"
33-
tokio = { version = "1.44.2", features = ["bytes"] }
34-
syscalls = { version = "0.6.18", default-features = false, features = ["std"] }
26+
nix = { workspace = true, features = ["uio"] }
27+
syscalls = { workspace = true, features = ["std"] }
28+
thread_local = { workspace = true }
29+
tokio = { workspace = true, features = ["bytes"] }
30+
tokio-seqpacket = { workspace = true }
3531

3632
[target.'cfg(unix)'.dependencies]
37-
fspy_shared_unix = { workspace = true }
3833
fspy_preload_unix = { workspace = true }
39-
nix = { version = "0.30.1", features = ["fs", "process", "socket", "feature"] }
34+
fspy_shared_unix = { workspace = true }
35+
memmap2 = { workspace = true }
36+
nix = { workspace = true, features = ["fs", "process", "socket", "feature"] }
4037
passfd = { git = "https://github.com/polachok/passfd", features = ["async"] }
41-
memmap2 = "0.9.7"
42-
# asyncfd = "0.1.2"
4338

4439
[target.'cfg(target_os = "macos")'.dependencies]
45-
phf = { version = "0.11.3", features = ["macros"] }
46-
40+
phf = { workspace = true }
4741

4842
[target.'cfg(any(target_os = "macos", windows))'.dependencies]
49-
xxhash-rust = { version = "0.8.15", features = ["const_xxh3"] }
50-
const_format = { version = "0.2.34", features = ["fmt"] }
51-
43+
const_format = { workspace = true, features = ["fmt"] }
44+
xxhash-rust = { workspace = true }
5245

5346
[target.'cfg(target_os = "windows")'.dependencies]
54-
winsafe = { version = "0.0.24", features = ["kernel"] }
55-
winapi = { workspace = true, features = [
56-
"winbase",
57-
"securitybaseapi",
58-
"handleapi",
59-
] }
60-
fspy_preload_windows = { workspace = true }
6147
fspy_detours_sys = { workspace = true }
48+
fspy_preload_windows = { workspace = true }
49+
winapi = { workspace = true, features = ["winbase", "securitybaseapi", "handleapi"] }
50+
winsafe = { workspace = true }
6251

6352
[target.'cfg(target_os = "macos")'.dev-dependencies]
64-
tempfile = "3.19.1"
53+
tempfile = { workspace = true }
6554

6655
[dev-dependencies]
67-
tokio = { version = "1.44.2", features = [
68-
"rt-multi-thread",
69-
"macros",
70-
"fs",
71-
"io-std",
72-
] }
73-
csv-async = { version = "1.3.1", features = ["tokio"] }
74-
ctor = "0.4.3"
56+
csv-async = { workspace = true }
57+
ctor = { workspace = true }
58+
tokio = { workspace = true, features = ["rt-multi-thread", "macros", "fs", "io-std"] }
7559

7660
[build-dependencies]
77-
attohttpc = "0.29.2"
78-
xxhash-rust = { version = "0.8.15", features = ["xxh3"] }
79-
flate2 = "1.1.1"
80-
tar = "0.4.44"
81-
anyhow = "1.0.98"
61+
anyhow = { workspace = true }
62+
attohttpc = { workspace = true }
63+
flate2 = { workspace = true }
64+
tar = { workspace = true }
65+
xxhash-rust = { workspace = true, features = ["xxh3"] }

crates/fspy_detours_sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ winapi = { workspace = true, features = ["minwindef", "libloaderapi", "processth
1616
workspace = true
1717

1818
[dev-dependencies]
19-
bindgen = "0.72.1"
19+
bindgen = { workspace = true }

crates/fspy_e2e/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[package]
22
name = "fspy_e2e"
33
version = "0.0.0"
4-
publish = false
54
edition.workspace = true
5+
publish = false
66

77
[dependencies]
88
fspy = { workspace = true }
9-
serde = { version = "1.0.219", features = ["derive"] }
10-
toml = "0.9.5"
11-
tokio = { version = "1.47.1", features = ["full"] }
12-
futures-util = "0.3.31"
9+
futures-util = { workspace = true }
10+
serde = { workspace = true, features = ["derive"] }
11+
tokio = { workspace = true, features = ["full"] }
12+
toml = { workspace = true }

crates/fspy_preload_unix/Cargo.toml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@ publish = false
77
crate-type = ["cdylib"]
88

99
[target.'cfg(target_os = "linux")'.dependencies]
10-
arrayvec = "0.7.6"
11-
syscalls = { version = "0.6.18", default-features = false }
10+
arrayvec = { workspace = true }
11+
const_format = { workspace = true }
1212
fspy_seccomp_unotify = { workspace = true, features = ["target"] }
13-
libc-print = "0.1.23"
14-
const_format = "0.2.34"
13+
libc-print = { workspace = true }
14+
syscalls = { workspace = true }
1515

1616
[target.'cfg(unix)'.dependencies]
17-
libc = "0.2.172"
18-
bstr = { version = "1.12.0", default-features = false }
19-
socket2 = "0.5.10"
20-
ctor = "0.4.2"
21-
thread_local = "1.1.9"
22-
arrayvec = "0.7.6"
23-
bincode = "2.0.1"
24-
bytemuck = { version = "1.23.0", features = ["extern_crate_alloc"] }
25-
derive-where = "1.4.0"
26-
path-dedot = "3.1.1"
27-
ref-cast = "1.0.24"
28-
which = "7.0.3"
29-
fspy_shared_unix = { workspace = true }
17+
anyhow = { workspace = true }
18+
arrayvec = { workspace = true }
19+
bincode = { workspace = true }
20+
bstr = { workspace = true, default-features = false }
21+
bytemuck = { workspace = true }
22+
ctor = { workspace = true }
23+
derive-where = { workspace = true }
3024
fspy_shared = { workspace = true }
31-
nix = { version = "0.30.1", features = ["signal", "fs", "socket", "mman", "time"] }
32-
memmap2 = "0.9.7"
33-
anyhow = "1.0.98"
25+
fspy_shared_unix = { workspace = true }
26+
libc = { workspace = true }
27+
memmap2 = { workspace = true }
28+
nix = { workspace = true, features = ["signal", "fs", "socket", "mman", "time"] }
3429
passfd = { workspace = true }
30+
path-dedot = { workspace = true }
31+
ref-cast = { workspace = true }
32+
socket2 = { workspace = true }
33+
thread_local = { workspace = true }
34+
which = { workspace = true }

crates/fspy_preload_windows/Cargo.toml

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,25 @@ edition.workspace = true
77
crate-type = ["cdylib"]
88

99
[target.'cfg(target_os = "windows")'.dependencies]
10-
# windows-sys = { version = "0.59.0", features = ["Win32_Foundation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_Security", "Win32_System_LibraryLoader"] }
11-
winsafe = { version = "0.0.24", features = ["kernel"] }
12-
winapi = { workspace = true, features = [
13-
"winerror",
14-
"winbase",
15-
"namedpipeapi",
16-
"memoryapi",
17-
"std",
18-
] }
19-
smallvec = { version = "2.0.0-alpha.11", features = ["std"] }
20-
widestring = "1.2.0"
21-
constcat = "0.6.1"
22-
backtrace = "0.3.75"
23-
arrayvec = "0.7.6"
24-
bincode = "2.0.1"
25-
bytemuck = { version = "1.23.0", features = ["extern_crate_alloc"] }
26-
derive-where = "1.4.0"
27-
path-dedot = "3.1.1"
28-
ref-cast = "1.0.24"
29-
which = "7.0.3"
30-
fspy_shared = { workspace = true }
10+
arrayvec = { workspace = true }
11+
backtrace = { workspace = true }
12+
bincode = { workspace = true }
13+
bytemuck = { workspace = true }
14+
constcat = { workspace = true }
15+
derive-where = { workspace = true }
3116
fspy_detours_sys = { workspace = true }
32-
ntapi = "0.4.1"
33-
17+
fspy_shared = { workspace = true }
18+
ntapi = { workspace = true }
19+
path-dedot = { workspace = true }
20+
ref-cast = { workspace = true }
21+
smallvec = { workspace = true }
22+
which = { workspace = true }
23+
widestring = { workspace = true }
24+
winapi = { workspace = true, features = ["winerror", "winbase", "namedpipeapi", "memoryapi", "std"] }
25+
winsafe = { workspace = true }
3426

3527
[target.'cfg(target_os = "windows")'.dev-dependencies]
36-
tempfile = "3.20.0"
28+
tempfile = { workspace = true }
3729

3830
[dependencies]
39-
dashmap = "6.1.0"
31+
dashmap = { workspace = true }

crates/fspy_seccomp_unotify/Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ edition = "2024"
55
publish = false
66

77
[target.'cfg(target_os = "linux")'.dependencies]
8-
seccompiler = { git = "https://github.com/branchseer/seccompiler", branch = "seccomp-action-raw" }
9-
arrayvec = "0.7.6"
10-
libc = "0.2.174"
11-
syscalls = { version = "0.6.18", default-features = false, features = ["std"] }
12-
tokio = { version = "1.46.1", features = [ "net", "process", "io-util", "rt" ] }
13-
nix = { version = "0.30.1", features = [ "process", "fs", "poll", "socket", "uio" ] }
14-
bytes = "1.10.1"
15-
tracing = "0.1.41"
16-
bincode = "2.0.1"
8+
arrayvec = { workspace = true }
9+
bincode = { workspace = true }
10+
bytes = { workspace = true }
11+
libc = { workspace = true }
12+
nix = { workspace = true, features = ["process", "fs", "poll", "socket", "uio"] }
1713
passfd = { workspace = true, default-features = false, optional = true }
14+
seccompiler = { workspace = true }
15+
syscalls = { workspace = true, features = ["std"] }
16+
tokio = { workspace = true, features = ["net", "process", "io-util", "rt"] }
17+
tracing = { workspace = true }
1818

1919
[target.'cfg(target_os = "linux")'.dev-dependencies]
20-
tokio = { version = "1.46.1", features = [ "macros", "time" ] }
21-
nix = { version = "0.30.1", features = [ "fs" ] }
22-
assertables = "9.8.1"
23-
test-log = { version = "0.2.18", features = ["trace"] }
24-
futures-util = "0.3.31"
20+
assertables = { workspace = true }
21+
futures-util = { workspace = true }
22+
nix = { workspace = true, features = ["fs"] }
23+
test-log = { workspace = true }
24+
tokio = { workspace = true, features = ["macros", "time"] }
2525

2626
[features]
2727
supervisor = ["dep:passfd", "passfd/async"]

0 commit comments

Comments
 (0)