summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <faern@faern.net>2023-01-10 10:21:51 +0100
committerLinus Färnstrand <linus@mullvad.net>2023-01-10 16:25:58 +0100
commitcf735015673b366789afdaa7d070496433d1725a (patch)
tree63808cdc5e323b95e930d0a7e449ae7f859dd60d
parent7ea38a3881b92b17658a5be4f0e627601212db6c (diff)
downloadmullvadvpn-cf735015673b366789afdaa7d070496433d1725a.tar.xz
mullvadvpn-cf735015673b366789afdaa7d070496433d1725a.zip
Remove unused Windows dependencies
-rw-r--r--Cargo.lock20
-rw-r--r--mullvad-daemon/Cargo.toml4
-rw-r--r--mullvad-paths/Cargo.toml1
-rw-r--r--talpid-core/Cargo.toml16
-rw-r--r--talpid-openvpn/Cargo.toml1
-rw-r--r--talpid-routing/Cargo.toml1
6 files changed, 3 insertions, 40 deletions
diff --git a/Cargo.lock b/Cargo.lock
index ba21b99a5e..e9a184966e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1714,7 +1714,6 @@ dependencies = [
name = "mullvad-paths"
version = "0.0.0"
dependencies = [
- "dirs-next",
"err-derive",
"log",
"widestring 1.0.2",
@@ -3132,7 +3131,6 @@ dependencies = [
"system-configuration",
"talpid-dbus",
"talpid-openvpn",
- "talpid-platform-metadata",
"talpid-routing",
"talpid-time",
"talpid-tunnel",
@@ -3150,7 +3148,6 @@ dependencies = [
"uuid",
"which",
"widestring 1.0.2",
- "windows",
"windows-service",
"windows-sys 0.42.0",
"winreg",
@@ -3201,7 +3198,6 @@ dependencies = [
"uuid",
"which",
"widestring 1.0.2",
- "winapi",
"windows-sys 0.42.0",
"winreg",
]
@@ -3255,7 +3251,6 @@ dependencies = [
"tokio",
"tokio-stream",
"widestring 1.0.2",
- "winapi",
"windows-sys 0.42.0",
]
@@ -4093,21 +4088,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
-name = "windows"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0286ba339aa753e70765d521bb0242cc48e1194562bfa2a2ad7ac8a6de28f5d5"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
-]
-
-[[package]]
name = "windows-service"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 0348051bfe..edc9dc1505 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -34,7 +34,6 @@ mullvad-types = { path = "../mullvad-types" }
mullvad-api = { path = "../mullvad-api" }
mullvad-version = { path = "../mullvad-version" }
talpid-core = { path = "../talpid-core" }
-talpid-dbus = { path = "../talpid-dbus" }
talpid-types = { path = "../talpid-types" }
talpid-platform-metadata = { path = "../talpid-platform-metadata" }
talpid-time = { path = "../talpid-time" }
@@ -49,6 +48,9 @@ android_logger = "0.8"
nix = "0.23"
simple-signal = "1.1"
+[target.'cfg(target_os="linux")'.dependencies]
+talpid-dbus = { path = "../talpid-dbus" }
+
[target.'cfg(windows)'.dependencies]
ctrlc = "3.0"
duct = "0.13"
diff --git a/mullvad-paths/Cargo.toml b/mullvad-paths/Cargo.toml
index 8ab2e9fe22..b8a4861012 100644
--- a/mullvad-paths/Cargo.toml
+++ b/mullvad-paths/Cargo.toml
@@ -12,7 +12,6 @@ err-derive = "0.3.1"
log = "0.4"
[target.'cfg(windows)'.dependencies]
-dirs-next = "2.0"
widestring = "1.0"
[target.'cfg(target_os = "windows")'.dependencies.windows-sys]
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 162bfd8ea9..c0fd4f3db2 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -80,26 +80,10 @@ subslice = "0.2"
[target.'cfg(windows)'.dependencies]
widestring = "1.0"
winreg = { version = "0.7", features = ["transactions"] }
-talpid-platform-metadata = { path = "../talpid-platform-metadata" }
memoffset = "0.6"
windows-service = "0.5.0"
talpid-windows-net = { path = "../talpid-windows-net" }
-[target.'cfg(windows)'.dependencies.windows]
-version = "0.42.0"
-features = [
- "Data_Xml_Dom",
- "Win32_Foundation",
- "Win32_Security",
- "Win32_System_Threading",
- "Win32_UI_WindowsAndMessaging",
- "Win32_NetworkManagement",
- "Win32_NetworkManagement_IpHelper",
- "Win32_NetworkManagement_Ndis",
- "Win32_Foundation",
- "Win32_Networking_WinSock",
-]
-
[target.'cfg(windows)'.dependencies.windows-sys]
version = "0.42.0"
features = [
diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml
index b936832a93..9f96252abf 100644
--- a/talpid-openvpn/Cargo.toml
+++ b/talpid-openvpn/Cargo.toml
@@ -42,7 +42,6 @@ which = { version = "4.0", default-features = false }
[target.'cfg(windows)'.dependencies]
widestring = "1.0"
winreg = { version = "0.7", features = ["transactions"] }
-winapi = { version = "0.3.6", features = ["ws2def"] }
talpid-windows-net = { path = "../talpid-windows-net" }
[target.'cfg(windows)'.dependencies.windows-sys]
diff --git a/talpid-routing/Cargo.toml b/talpid-routing/Cargo.toml
index e248f4e345..b39ca555a8 100644
--- a/talpid-routing/Cargo.toml
+++ b/talpid-routing/Cargo.toml
@@ -37,7 +37,6 @@ libc = "0.2"
socket2 = { version = "0.4.2", features = ["all"] }
talpid-windows-net = { path = "../talpid-windows-net" }
widestring = "1.0"
-winapi = { version = "0.3.6", features = ["ws2def"] }
windows-sys = { version = "0.42.0", features = [
"Win32_NetworkManagement_Ndis",
"Win32_Globalization"