Skip to content

Commit

Permalink
refactor: promote all dependencies to workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
@fujiapple852
fujiapple852 committed Jun 30, 2024
1 parent 9f38879 commit 297cbe8
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 50 deletions.
45 changes: 42 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,54 @@ trippy-privilege = { version = "0.11.0-dev", path = "crates/trippy-privilege" }
trippy-dns = { version = "0.11.0-dev", path = "crates/trippy-dns" }
trippy-packet = { version = "0.11.0-dev", path = "crates/trippy-packet" }
anyhow = "1.0.83"
derive_more = { version = "0.99.18", default-features = false, features = [ "mul", "add", "add_assign" ] }
arrayvec = { version = "0.7.4", default-features = false }
bitflags = "2.6.0"
caps = "0.5.5"
chrono = { version = "0.4.38", default-features = false }
clap = { version = "4.4.0", default-features = false }
clap_complete = "4.4.9"
clap_mangen = "0.2.20"
comfy-table = { version = "7.1.0", default-features = false }
crossbeam = "0.8.4"
crossterm = { version = "0.27.0", default-features = false }
csv = "1.3.0"
derive_more = { version = "0.99.18", default-features = false }
dns-lookup = "2.0.4"
encoding_rs_io = "0.1.7"
etcetera = "0.8.0"
hex-literal = "0.4.1"
hickory-resolver = "0.24.1"
humantime = "2.1.0"
indexmap = { version = "2.2.6", default-features = false }
insta = "1.39.0"
ipnetwork = "0.20.0"
itertools = "0.13.0"
maxminddb = "0.24.0"
mockall = "0.12.1"
nix = { version = "0.29.0", default-features = false }
parking_lot = "0.12.3"
serde = { version = "1.0.201", default-features = false, features = ["derive"] }
paste = "1.0.15"
petgraph = "0.6.5"
pretty_assertions = "1.4.0"
rand = "0.8.5"
ratatui = "0.27.0"
serde = { version = "1.0.201", default-features = false }
serde_json = { version = "1.0.117", default-features = false }
serde_with = "3.8.1"
serde_yaml = "=0.9.33"
socket2 = "0.5.7"
strum = { version = "0.26.3", default-features = false }
test-case = "3.3.1"
thiserror = "1.0.60"
tracing = { version = "0.1.40" }
tokio = "1.38.0"
tokio-util = "0.7.11"
toml = { version = "0.8.14", default-features = false }
tracing = "0.1.40"
tracing-chrome = "0.7.2"
tracing-subscriber = { version = "0.3.18", default-features = false }
tun2 = "2.0.1"
widestring = "1.0.2"
windows-sys = "0.52.0"

[workspace.lints.rust]
unsafe_code = "deny"
Expand Down
34 changes: 17 additions & 17 deletions crates/trippy-core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ categories.workspace = true
[dependencies]
trippy-packet.workspace = true
trippy-privilege.workspace = true
arrayvec = { version = "0.7.4", default-features = false }
bitflags = "2.6.0"
derive_more.workspace = true
indexmap = { version = "2.2.6", default-features = false, features = [ "std" ] }
arrayvec.workspace = true
bitflags.workspace = true
derive_more = { workspace = true, default-features = false, features = [ "mul", "add", "add_assign" ] }
indexmap = { workspace = true, default-features = false, features = [ "std" ] }
itertools.workspace = true
parking_lot.workspace = true
socket2 = { version = "0.5.7", features = [ "all" ] }
socket2 = { workspace = true, features = [ "all" ] }
thiserror.workspace = true
tracing.workspace = true

[target.'cfg(unix)'.dependencies]
nix = { version = "0.29.0", default-features = false, features = [ "user", "poll", "net" ] }
nix = { workspace = true, default-features = false, features = [ "user", "poll", "net" ] }

[target.'cfg(windows)'.dependencies]
paste = "1.0.15"
widestring = "1.0.2"
windows-sys = { version = "0.52.0", features = [
paste.workspace = true
widestring.workspace = true
windows-sys = { workspace = true, features = [
"Win32_Foundation",
"Win32_Networking_WinSock",
"Win32_System_IO",
Expand All @@ -46,19 +46,19 @@ windows-sys = { version = "0.52.0", features = [
[dev-dependencies]
anyhow.workspace = true
hex-literal.workspace = true
ipnetwork = "0.20.0"
mockall = "0.12.1"
rand = "0.8.5"
serde.workspace = true
ipnetwork.workspace = true
mockall.workspace = true
rand.workspace = true
serde = { workspace = true, default-features = false, features = [ "derive" ] }
serde_yaml.workspace = true
test-case.workspace = true
tokio = { version = "1.38.0", features = [ "full" ] }
tokio-util = "0.7.11"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
tokio-util.workspace = true
tokio = { workspace = true, features = [ "full" ] }
tracing-subscriber.workspace = true

# see https://github.com/meh/rust-tun/pull/74
[target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dev-dependencies]
tun2 = { version = "2.0.1", features = [ "async" ] }
tun2 = { workspace = true, features = [ "async" ] }

[features]
# Enable simulation integration tests
Expand Down
6 changes: 3 additions & 3 deletions crates/trippy-dns/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ keywords.workspace = true
categories.workspace = true

[dependencies]
crossbeam = "0.8.4"
dns-lookup = "2.0.4"
hickory-resolver = "0.24.1"
crossbeam.workspace = true
dns-lookup.workspace = true
hickory-resolver.workspace = true
itertools.workspace = true
parking_lot.workspace = true
thiserror.workspace = true
Expand Down
8 changes: 4 additions & 4 deletions crates/trippy-privilege/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ categories.workspace = true
thiserror.workspace = true

[target.'cfg(target_os = "linux")'.dependencies]
caps = "0.5.5"
caps.workspace = true

[target.'cfg(unix)'.dependencies]
nix = { version = "0.29.0", default-features = false, features = [ "user" ] }
nix = { workspace = true, default-features = false, features = [ "user" ] }

[target.'cfg(windows)'.dependencies]
paste = "1.0.15"
windows-sys = { version = "0.52.0", features = [
windows-sys = { workspace = true, features = [
"Win32_Foundation",
"Win32_System_Threading",
] }
paste.workspace = true

[dev-dependencies]
anyhow.workspace = true
Expand Down
55 changes: 32 additions & 23 deletions crates/trippy-tui/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,43 @@ trippy-core.workspace = true
trippy-privilege.workspace = true
trippy-dns.workspace = true
anyhow.workspace = true
chrono = { version = "0.4.38", default-features = false, features = [ "clock" ] }
clap = { version = "4.4.0", default-features = false, features = [ "cargo", "derive", "wrap_help", "usage", "unstable-styles", "color", "suggestions", "error-context" ] }
clap_complete = "4.4.9"
clap_mangen = "0.2.20"
comfy-table = { version = "7.1.0", default-features = false }
crossterm = { version = "0.27.0", default-features = false, features = [ "events", "windows" ] }
csv = "1.3.0"
chrono = { workspace = true, default-features = false, features = [ "clock" ] }
clap = { workspace = true, default-features = false, features = [
"cargo",
"derive",
"wrap_help",
"usage",
"unstable-styles",
"color",
"suggestions",
"error-context"
] }
clap_complete.workspace = true
clap_mangen.workspace = true
comfy-table.workspace = true
crossterm = { workspace = true, default-features = false, features = [ "events", "windows" ] }
csv.workspace = true
derive_more.workspace = true
encoding_rs_io = "0.1.7"
etcetera = "0.8.0"
humantime = "2.1.0"
encoding_rs_io.workspace = true
etcetera.workspace = true
humantime.workspace = true
itertools.workspace = true
maxminddb = "0.24.0"
petgraph = "0.6.5"
ratatui = "0.27.0"
serde.workspace = true
serde_json = { version = "1.0.117", default-features = false }
serde_with = "3.8.1"
strum = { version = "0.26.3", default-features = false, features = [ "std", "derive" ] }
maxminddb.workspace = true
petgraph.workspace = true
ratatui.workspace = true
serde = { workspace = true, default-features = false, features = [ "derive" ] }
serde_json.workspace = true
serde_with.workspace = true
strum = { workspace = true, default-features = false, features = [ "std", "derive" ] }
thiserror.workspace = true
toml = { version = "0.8.14", default-features = false, features = [ "parse" ] }
tracing-chrome = "0.7.2"
tracing-subscriber = { version = "0.3.18", default-features = false, features = [ "json", "env-filter" ] }
toml = { workspace = true, default-features = false, features = [ "parse" ] }
tracing-chrome.workspace = true
tracing-subscriber = { workspace = true, default-features = false, features = [ "env-filter", "json" ] }
tracing.workspace = true

[dev-dependencies]
insta = { version = "1.39.0", features = ["serde"] }
pretty_assertions = "1.4.0"
insta = { workspace = true, features = ["serde"] }
pretty_assertions.workspace = true
serde_yaml.workspace = true
test-case.workspace = true

Expand All @@ -54,5 +63,5 @@ workspace = true

[package.metadata.generate-rpm]
assets = [
{ source = "target/release/trip", dest = "/usr/bin/trip", mode = "755" },
{ source = "target/release/trip", dest = "/usr/bin/trip", mode = "755" },
]

0 comments on commit 297cbe8

Please sign in to comment.