From 3cbed2f07d23f90b2d865afa10be7bebfbb4a6a7 Mon Sep 17 00:00:00 2001 From: Joakim Hulthe Date: Wed, 8 Jan 2025 16:00:37 +0100 Subject: [PATCH] fixup: workspace deps --- Cargo.toml | 1 + leak-checker/Cargo.toml | 6 +++--- mullvad-cli/Cargo.toml | 2 +- mullvad-daemon/Cargo.toml | 2 +- windows-installer/Cargo.toml | 4 ++-- wireguard-go-rs/Cargo.toml | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 03f7d6247998..505ed7bc47fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -126,6 +126,7 @@ hyper-util = {version = "0.1.8", features = ["client", "client-legacy", "http2", env_logger = "0.10.0" thiserror = "2.0" +anyhow = "1.0" log = "0.4" shadowsocks = "1.20.3" diff --git a/leak-checker/Cargo.toml b/leak-checker/Cargo.toml index 16332d0052bd..0b7d9744398e 100644 --- a/leak-checker/Cargo.toml +++ b/leak-checker/Cargo.toml @@ -9,8 +9,8 @@ rust-version.workspace = true [dependencies] log.workspace = true -anyhow = "1.0" -socket2 = { version = "0.5.7", features = ["all"] } +anyhow.workspace = true +socket2 = { workspace = true, features = ["all"] } match_cfg = "0.1.0" pnet_packet = "0.35.0" pretty_env_logger = "0.5.0" @@ -18,7 +18,7 @@ tokio = { workspace = true, features = ["macros", "time", "rt", "sync", "net"] } futures.workspace = true serde = { workspace = true, features = ["derive"] } reqwest = { version = "0.12.9", default-features = false, features = ["json", "rustls-tls"] } -clap = { version = "*", features = ["derive"] } +clap = { workspace = true, features = ["derive"] } [dev-dependencies] tokio = { workspace = true, features = ["full"] } diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml index 9997531d53f7..a489123847fd 100644 --- a/mullvad-cli/Cargo.toml +++ b/mullvad-cli/Cargo.toml @@ -15,7 +15,7 @@ name = "mullvad" path = "src/main.rs" [dependencies] -anyhow = "1.0" +anyhow = { workspace = true } chrono = { workspace = true } clap = { workspace = true } thiserror = { workspace = true } diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index 10291cd63870..ee7b3c901b57 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -15,7 +15,7 @@ workspace = true api-override = ["mullvad-api/api-override"] [dependencies] -anyhow = "*" # TODO: do we want this? +anyhow = { workspace = true } chrono = { workspace = true } thiserror = { workspace = true } either = "1.11" diff --git a/windows-installer/Cargo.toml b/windows-installer/Cargo.toml index 5c09cf560c70..518fe2d82d53 100644 --- a/windows-installer/Cargo.toml +++ b/windows-installer/Cargo.toml @@ -13,11 +13,11 @@ workspace = true [target.'cfg(all(target_os = "windows", target_arch = "x86_64"))'.dependencies] windows-sys = { version = "0.52.0", features = ["Win32_System", "Win32_System_LibraryLoader", "Win32_System_SystemInformation", "Win32_System_Threading"] } tempfile = "3.10" -anyhow = "1.0" +anyhow.workspace = true [build-dependencies] winres = "0.1" -anyhow = "1.0" +anyhow.workspace = true windows-sys = { version = "0.52.0", features = ["Win32_System", "Win32_System_LibraryLoader", "Win32_System_SystemServices"] } mullvad-version = { path = "../mullvad-version" } diff --git a/wireguard-go-rs/Cargo.toml b/wireguard-go-rs/Cargo.toml index cfaef554cc40..cdea4afdad1d 100644 --- a/wireguard-go-rs/Cargo.toml +++ b/wireguard-go-rs/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" license.workspace = true [build-dependencies] -anyhow = "1.0" +anyhow.workspace = true [target.'cfg(unix)'.dependencies] thiserror.workspace = true