Merge branch 'weekly-cleanup/rewrite-talpid-openvpn-to-be-more-async-…

…des-285' into main
mullvad · Oct 11, 2023 · 51e06a4 · 51e06a4
2 parents 9383325 + 968c1eb
commit 51e06a4
Show file tree

Hide file tree

Showing 20 changed files with 199 additions and 264 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,6 +60,7 @@ windows-sys = "0.48.0"
 
 chrono = { version = "0.4.26", default-features = false}
 clap = { version = "4.2.7", features = ["cargo", "derive"] }
+once_cell = "1.13"
 
 
 [profile.release]

diff --git a/android/translations-converter/Cargo.toml b/android/translations-converter/Cargo.toml
@@ -11,7 +11,7 @@ publish.workspace = true
 [dependencies]
 err-derive = { workspace = true }
 htmlize = { version = "1.0.2", features = ["unescape"] }
-once_cell = "1.13"
+once_cell = { workspace = true }
 regex = "1"
 serde = { version = "1", features = ["derive"] }
 quick-xml = { version = "0.27.1", features = ["serialize"] }
diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml
@@ -26,7 +26,7 @@ tokio = { workspace = true, features = ["macros", "time", "rt-multi-thread", "ne
 tokio-rustls = "0.24.1"
 tokio-socks = "0.5.1"
 rustls-pemfile = "1.0.3"
-once_cell = "1.13"
+once_cell = { workspace = true }
 
 mullvad-fs = { path = "../mullvad-fs" }
 mullvad-types = { path = "../mullvad-types" }

diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
@@ -17,7 +17,7 @@ chrono = { workspace = true }
 err-derive = { workspace = true }
 fern = { version = "0.6", features = ["colored"] }
 futures = "0.3"
-once_cell = "1.13"
+once_cell = { workspace = true }
 libc = "0.2"
 log = { workspace = true }
 regex = "1.0"

diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml
@@ -25,7 +25,7 @@ log = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 nix = "0.23"
-once_cell = "1.13"
+once_cell = { workspace = true }
 
 [build-dependencies]
 tonic-build = { workspace = true, default-features = false, features = ["transport", "prost"] }
diff --git a/mullvad-paths/Cargo.toml b/mullvad-paths/Cargo.toml
@@ -16,7 +16,7 @@ log = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
 widestring = "1.0"
-once_cell = "1.13"
+once_cell = { workspace = true }
 
 [target.'cfg(windows)'.dependencies.windows-sys]
 workspace = true

diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
@@ -11,7 +11,7 @@ publish.workspace = true
 [dependencies]
 dirs = "5.0.1"
 err-derive = { workspace = true }
-once_cell = "1.13"
+once_cell = { workspace = true }
 log = { workspace = true }
 regex = "1.0"
 uuid = { version = "1.4.1", features = ["v4"] }

diff --git a/mullvad-relay-selector/Cargo.toml b/mullvad-relay-selector/Cargo.toml
@@ -25,4 +25,4 @@ mullvad-api = { path = "../mullvad-api" }
 mullvad-types = { path = "../mullvad-types" }
 
 [dev-dependencies]
-once_cell = "1.13"
+once_cell = { workspace = true }
diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/main.rs"
 clap = { workspace = true }
 env_logger = { workspace = true }
 err-derive = { workspace = true }
-once_cell = "1.13"
+once_cell = { workspace = true }
 
 mullvad-management-interface = { path = "../mullvad-management-interface" }
 

diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
@@ -12,7 +12,7 @@ publish.workspace = true
 chrono = { workspace = true, features = ["clock", "serde"] }
 err-derive = { workspace = true }
 ipnetwork = "0.16"
-once_cell = "1.13"
+once_cell = { workspace = true }
 log = { workspace = true }
 regex = "1"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
@@ -9,11 +9,10 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-duct = "0.13"
 err-derive = { workspace = true }
 futures = "0.3.15"
 ipnetwork = "0.16"
-once_cell = "1.13"
+once_cell = { workspace = true }
 libc = "0.2"
 log = { workspace = true }
 parking_lot = "0.12.0"
@@ -42,6 +41,7 @@ nftnl = { version = "0.6.2", features = ["nftnl-1-1-0"] }
 mnl = { version = "0.2.2", features = ["mnl-1-0-4"] }
 which = { version = "4.0", default-features = false }
 talpid-dbus = { path = "../talpid-dbus" }
+duct = "0.13"
 
 
 [target.'cfg(target_os = "macos")'.dependencies]
@@ -51,6 +51,7 @@ trust-dns-server = { version = "0.23.0", features = ["resolver"] }
 trust-dns-proto = "0.23.0"
 subslice = "0.2"
 async-trait = "0.1"
+duct = "0.13"
 
 
 [target.'cfg(windows)'.dependencies]

diff --git a/talpid-dbus/Cargo.toml b/talpid-dbus/Cargo.toml
@@ -10,7 +10,7 @@ publish.workspace = true
 [target.'cfg(target_os = "linux")'.dependencies]
 dbus = "0.9"
 err-derive = { workspace = true }
-once_cell = "1.13"
+once_cell = { workspace = true }
 log = { workspace = true }
 libc = "0.2"
 tokio = { workspace = true, features = ["rt"] }
diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml
@@ -11,11 +11,9 @@ publish.workspace = true
 
 [dependencies]
 async-trait = "0.1"
-duct = "0.13"
 err-derive = { workspace = true }
 futures = "0.3.15"
-is-terminal = "0.4.2"
-once_cell = "1.13"
+once_cell = { workspace = true }
 log = { workspace = true }
 os_pipe = "1.1.4"
 parking_lot = "0.12.0"