diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-08-02 10:16:10 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-08-02 10:16:10 +0200 |
| commit | 771bb16aa0f77bd0294fd00ee91eccabaf20cc5a (patch) | |
| tree | e77c4eae64d40732d66caf0708c524ac2b639f98 | |
| parent | e298b58547ede6d03881dbfcc8b46b7193af4ad5 (diff) | |
| parent | 983689840d25fac92d8002baf966e695ee7e55e6 (diff) | |
| download | mullvadvpn-771bb16aa0f77bd0294fd00ee91eccabaf20cc5a.tar.xz mullvadvpn-771bb16aa0f77bd0294fd00ee91eccabaf20cc5a.zip | |
Merge branch 'remove-unused-talpid-core-dependencies'
| -rw-r--r-- | Cargo.lock | 16 | ||||
| -rw-r--r-- | talpid-core/Cargo.toml | 25 |
2 files changed, 3 insertions, 38 deletions
diff --git a/Cargo.lock b/Cargo.lock index fe175b922a..c8b2891765 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3619,14 +3619,11 @@ version = "0.0.0" dependencies = [ "async-trait", "bitflags", - "byteorder", "chrono", "duct", "err-derive", "futures", - "hex", "inotify 0.10.0", - "internet-checksum", "ipnetwork", "jnix", "lazy_static", @@ -3634,23 +3631,15 @@ dependencies = [ "log", "memoffset 0.6.4", "mnl", - "netlink-packet-route", - "netlink-sys", "nftnl", "nix 0.23.1", "once_cell", - "parity-tokio-ipc", "parking_lot", "pfctl", - "prost", "quickcheck", "quickcheck_macros", "rand 0.8.5", - "regex", "resolv-conf", - "rtnetlink", - "shell-escape", - "socket2", "subslice", "system-configuration", "talpid-dbus", @@ -3662,20 +3651,15 @@ dependencies = [ "talpid-types", "talpid-windows-net", "talpid-wireguard", - "tempfile", "tokio", - "tonic", "tonic-build", "triggered", "trust-dns-server", - "tun", - "uuid", "which", "widestring 1.0.2", "windows-service", "windows-sys 0.45.0", "winreg", - "zeroize", ] [[package]] diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index d069f3fd6d..55573a2e7e 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -9,58 +9,39 @@ edition.workspace = true publish.workspace = true [dependencies] -bitflags = "1.2" -async-trait = "0.1" duct = "0.13" err-derive = "0.3.1" futures = "0.3.15" -hex = "0.4" ipnetwork = "0.16" lazy_static = "1.0" once_cell = "1.13" libc = "0.2" log = "0.4" parking_lot = "0.12.0" -regex = "1.1.0" talpid-routing = { path = "../talpid-routing" } talpid-types = { path = "../talpid-types" } talpid-time = { path = "../talpid-time" } talpid-tunnel-config-client = { path = "../talpid-tunnel-config-client" } talpid-tunnel = { path = "../talpid-tunnel" } talpid-wireguard = { path = "../talpid-wireguard" } -zeroize = "1" chrono = { version = "0.4.26", default-features = false } tokio = { workspace = true, features = ["process", "rt-multi-thread", "fs"] } rand = "0.8.5" [target.'cfg(not(target_os="android"))'.dependencies] -byteorder = "1" -internet-checksum = "0.2" -shell-escape = "0.1" -socket2 = { version = "0.4.2", features = ["all"] } -parity-tokio-ipc = "0.9" talpid-openvpn = { path = "../talpid-openvpn" } triggered = "0.1.1" -tonic = { workspace = true } -prost = { workspace = true } -uuid = { version = "0.8", features = ["v4"] } - -[target.'cfg(unix)'.dependencies] -nix = "0.23" [target.'cfg(target_os = "android")'.dependencies] jnix = { version = "0.5", features = ["derive"] } [target.'cfg(target_os = "linux")'.dependencies] +nix = "0.23" inotify = "0.10" resolv-conf = "0.7" -rtnetlink = "0.11" -netlink-packet-route = "0.13" -netlink-sys = "0.8.3" 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 } -tun = "0.5.1" talpid-dbus = { path = "../talpid-dbus" } @@ -68,11 +49,12 @@ talpid-dbus = { path = "../talpid-dbus" } pfctl = "0.4.4" system-configuration = "0.5.1" trust-dns-server = { version = "0.22.0", features = ["resolver"] } -tun = "0.5.1" subslice = "0.2" +async-trait = "0.1" [target.'cfg(windows)'.dependencies] +bitflags = "1.2" widestring = "1.0" winreg = { version = "0.7", features = ["transactions"] } memoffset = "0.6" @@ -109,7 +91,6 @@ features = [ tonic-build = { workspace = true, default-features = false, features = ["transport", "prost"] } [dev-dependencies] -tempfile = "3.0" quickcheck = { version = "1.0", default-features = false } quickcheck_macros = "1.0" tokio = { workspace = true, features = [ "test-util" ] } |
