summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2023-08-02 15:07:31 +0200
committerLinus Färnstrand <linus@mullvad.net>2023-08-02 15:07:31 +0200
commit6d996ad5332af5d2244d5b2cdc4c6b18f90b6611 (patch)
treefefb403415b7a010a88b97e0864dba6c3a49125d
parent151a52c5671fa260faae2be9fb12386616019cbc (diff)
parent878dd8bbbda5f78944e6b778feb763fc7b2681ca (diff)
downloadmullvadvpn-6d996ad5332af5d2244d5b2cdc4c6b18f90b6611.tar.xz
mullvadvpn-6d996ad5332af5d2244d5b2cdc4c6b18f90b6611.zip
Merge branch 'remove-unused-dependencies'
-rw-r--r--Cargo.lock19
-rw-r--r--mullvad-api/Cargo.toml1
-rw-r--r--mullvad-cli/Cargo.toml3
-rw-r--r--mullvad-daemon/Cargo.toml4
-rw-r--r--mullvad-jni/Cargo.toml4
-rw-r--r--mullvad-relay-selector/Cargo.toml2
-rw-r--r--talpid-openvpn/Cargo.toml5
-rw-r--r--talpid-routing/Cargo.toml2
-rw-r--r--tunnel-obfuscation/Cargo.toml1
9 files changed, 0 insertions, 41 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c8b2891765..5b86d9b4b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1960,7 +1960,6 @@ dependencies = [
"mullvad-fs",
"mullvad-types",
"once_cell",
- "regex",
"rustls-pemfile",
"serde",
"serde_json",
@@ -1976,7 +1975,6 @@ name = "mullvad-cli"
version = "0.0.0"
dependencies = [
"anyhow",
- "base64 0.13.0",
"chrono",
"clap",
"clap_complete",
@@ -1984,11 +1982,9 @@ dependencies = [
"futures",
"itertools",
"mullvad-management-interface",
- "mullvad-paths",
"mullvad-types",
"mullvad-version",
"natord",
- "serde",
"talpid-types",
"tokio",
"windows-sys 0.45.0",
@@ -2000,16 +1996,13 @@ name = "mullvad-daemon"
version = "0.0.0"
dependencies = [
"android_logger",
- "cfg-if",
"chrono",
"clap",
"ctrlc",
"dirs",
- "duct",
"err-derive",
"fern",
"futures",
- "ipnetwork",
"lazy_static",
"libc",
"log",
@@ -2036,7 +2029,6 @@ dependencies = [
"talpid-types",
"tokio",
"tokio-stream",
- "uuid",
"winapi",
"windows-service",
"windows-sys 0.45.0",
@@ -2070,20 +2062,16 @@ dependencies = [
"futures",
"ipnetwork",
"jnix",
- "lazy_static",
"log",
"log-panics",
"mullvad-api",
"mullvad-daemon",
- "mullvad-paths",
"mullvad-problem-report",
"mullvad-types",
"nix 0.23.1",
"rand 0.8.5",
- "talpid-core",
"talpid-tunnel",
"talpid-types",
- "tokio",
]
[[package]]
@@ -2164,12 +2152,10 @@ dependencies = [
"mullvad-types",
"parking_lot",
"rand 0.8.5",
- "serde",
"serde_json",
"talpid-core",
"talpid-types",
"tokio",
- "tokio-stream",
]
[[package]]
@@ -3679,8 +3665,6 @@ name = "talpid-openvpn"
version = "0.0.0"
dependencies = [
"async-trait",
- "bitflags",
- "cfg-if",
"duct",
"err-derive",
"futures",
@@ -3703,7 +3687,6 @@ dependencies = [
"tonic-build",
"triggered",
"uuid",
- "which",
"widestring 1.0.2",
"windows-sys 0.45.0",
"winreg",
@@ -3753,7 +3736,6 @@ dependencies = [
"netlink-sys",
"nix 0.26.1",
"rtnetlink",
- "socket2",
"system-configuration",
"talpid-types",
"talpid-windows-net",
@@ -4310,7 +4292,6 @@ version = "0.0.0"
dependencies = [
"async-trait",
"err-derive",
- "futures",
"tokio",
"udp-over-tcp",
]
diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml
index f8e0987d97..8247f5c238 100644
--- a/mullvad-api/Cargo.toml
+++ b/mullvad-api/Cargo.toml
@@ -20,7 +20,6 @@ http = "0.2"
hyper = { version = "0.14", features = ["client", "stream", "http1", "tcp" ] }
ipnetwork = "0.16"
log = "0.4"
-regex = "1"
serde = "1"
serde_json = "1.0"
tokio = { workspace = true, features = ["macros", "time", "rt-multi-thread", "net", "io-std", "io-util", "fs"] }
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index f75b3673de..a8d9949306 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -15,17 +15,14 @@ path = "src/main.rs"
[dependencies]
anyhow = "1.0"
-base64 = "0.13"
chrono = { workspace = true }
clap = { version = "4.2.7", features = ["cargo", "derive"] }
env_logger = "0.10.0"
futures = "0.3"
natord = "1.0.9"
-serde = "1.0"
itertools = "0.10"
mullvad-types = { path = "../mullvad-types", features = ["clap"] }
-mullvad-paths = { path = "../mullvad-paths" }
mullvad-version = { path = "../mullvad-version" }
talpid-types = { path = "../talpid-types" }
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 08cc77fcea..273c5ab6f6 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -13,12 +13,10 @@ publish.workspace = true
api-override = ["mullvad-api/api-override"]
[dependencies]
-cfg-if = "1.0"
chrono = { workspace = true }
err-derive = "0.3.1"
fern = { version = "0.6", features = ["colored"] }
futures = "0.3"
-ipnetwork = "0.16"
lazy_static = "1.0"
libc = "0.2"
log = "0.4"
@@ -29,7 +27,6 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tokio = { workspace = true, features = ["fs", "io-util", "rt-multi-thread", "sync", "time"] }
tokio-stream = "0.1"
-uuid = { version = "0.8", features = ["v4"] }
mullvad-relay-selector = { path = "../mullvad-relay-selector" }
mullvad-types = { path = "../mullvad-types" }
@@ -62,7 +59,6 @@ objc = "0.2.3"
[target.'cfg(windows)'.dependencies]
ctrlc = "3.0"
-duct = "0.13"
windows-service = "0.6.0"
winapi = { version = "0.3", features = ["winnt", "excpt"] }
dirs = "5.0.1"
diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml
index edb21d437a..2b1075c649 100644
--- a/mullvad-jni/Cargo.toml
+++ b/mullvad-jni/Cargo.toml
@@ -20,18 +20,14 @@ err-derive = "0.3.1"
futures = "0.3"
ipnetwork = "0.16"
jnix = { version = "0.5", features = ["derive"] }
-lazy_static = "1"
log = "0.4"
log-panics = "2"
nix = "0.23"
rand = "0.8.5"
-tokio = { workspace = true }
mullvad-daemon = { path = "../mullvad-daemon" }
-mullvad-paths = { path = "../mullvad-paths" }
mullvad-problem-report = { path = "../mullvad-problem-report" }
mullvad-types = { path = "../mullvad-types" }
mullvad-api = { path = "../mullvad-api" }
-talpid-core = { path = "../talpid-core" }
talpid-tunnel = { path = "../talpid-tunnel" }
talpid-types = { path = "../talpid-types" }
diff --git a/mullvad-relay-selector/Cargo.toml b/mullvad-relay-selector/Cargo.toml
index 39a891ab35..6a69062395 100644
--- a/mullvad-relay-selector/Cargo.toml
+++ b/mullvad-relay-selector/Cargo.toml
@@ -16,10 +16,8 @@ ipnetwork = "0.16"
log = "0.4"
parking_lot = "0.12.0"
rand = "0.8.5"
-serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tokio = { workspace = true, features = ["fs", "io-util", "time"] }
-tokio-stream = "0.1"
talpid-core = { path = "../talpid-core" }
talpid-types = { path = "../talpid-types" }
diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml
index af054617d0..4ffc49eaed 100644
--- a/talpid-openvpn/Cargo.toml
+++ b/talpid-openvpn/Cargo.toml
@@ -10,9 +10,7 @@ publish.workspace = true
[dependencies]
-bitflags = "1.2"
async-trait = "0.1"
-cfg-if = "1.0"
duct = "0.13"
err-derive = "0.3.1"
futures = "0.3.15"
@@ -36,9 +34,6 @@ triggered = "0.1.1"
tonic = { workspace = true }
prost = { workspace = true }
-[target.'cfg(target_os = "linux")'.dependencies]
-which = { version = "4.0", default-features = false }
-
[target.'cfg(windows)'.dependencies]
widestring = "1.0"
winreg = { version = "0.7", features = ["transactions"] }
diff --git a/talpid-routing/Cargo.toml b/talpid-routing/Cargo.toml
index 73cb3341fe..e21ec6da51 100644
--- a/talpid-routing/Cargo.toml
+++ b/talpid-routing/Cargo.toml
@@ -14,7 +14,6 @@ err-derive = "0.3.1"
futures = "0.3.15"
ipnetwork = "0.16"
log = "0.4"
-talpid-types = { path = "../talpid-types" }
tokio = { workspace = true, features = ["process", "rt-multi-thread", "net"] }
[target.'cfg(not(target_os="android"))'.dependencies]
@@ -37,7 +36,6 @@ system-configuration = "0.5.1"
[target.'cfg(windows)'.dependencies]
libc = "0.2"
-socket2 = { version = "0.4.2", features = ["all"] }
talpid-windows-net = { path = "../talpid-windows-net" }
widestring = "1.0"
diff --git a/tunnel-obfuscation/Cargo.toml b/tunnel-obfuscation/Cargo.toml
index 0c209d2532..2447b2984d 100644
--- a/tunnel-obfuscation/Cargo.toml
+++ b/tunnel-obfuscation/Cargo.toml
@@ -11,6 +11,5 @@ publish.workspace = true
[dependencies]
async-trait = "0.1"
err-derive = "0.3.0"
-futures = "0.3.5"
tokio = { workspace = true, features = ["rt-multi-thread", "macros", "net", "io-util"] }
udp-over-tcp = { git = "https://github.com/mullvad/udp-over-tcp", rev = "87936ac29b68b902565955f138ab02294bcc8593" }