summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2022-02-17 15:10:51 +0000
committerEmīls <emils@mullvad.net>2022-02-17 15:10:51 +0000
commit66b27c005ba03d8e7ce36fb34180a91597e62b59 (patch)
treefe13f2922014371ac445ff58dd883fdc0116ef99
parent66e90f14b21e4c8f3205ba3b94019e25f2bf10a2 (diff)
parentc046e5358e19f8ed66a2a7995914992cd2beb105 (diff)
downloadmullvadvpn-66b27c005ba03d8e7ce36fb34180a91597e62b59.tar.xz
mullvadvpn-66b27c005ba03d8e7ce36fb34180a91597e62b59.zip
Merge branch 'remove-extra-whitespace-from-cargo-tomls'
-rw-r--r--mullvad-daemon/Cargo.toml2
-rw-r--r--mullvad-management-interface/Cargo.toml2
-rw-r--r--mullvad-problem-report/Cargo.toml2
-rw-r--r--mullvad-rpc/Cargo.toml2
-rw-r--r--mullvad-setup/Cargo.toml4
-rw-r--r--talpid-core/Cargo.toml8
-rw-r--r--talpid-openvpn-plugin/Cargo.toml2
-rw-r--r--talpid-types/Cargo.toml2
8 files changed, 12 insertions, 12 deletions
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index de379d60d9..e382c056c0 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -25,7 +25,7 @@ rand = "0.7"
regex = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
-tokio = { version = "1.8", features = [ "fs", "rt-multi-thread", "sync", "time" ] }
+tokio = { version = "1.8", features = ["fs", "rt-multi-thread", "sync", "time"] }
tokio-stream = "0.1"
uuid = { version = "0.8", features = ["v4"] }
diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml
index d17eba82d9..e6b00a36b1 100644
--- a/mullvad-management-interface/Cargo.toml
+++ b/mullvad-management-interface/Cargo.toml
@@ -18,7 +18,7 @@ prost = "0.8"
prost-types = "0.8"
parity-tokio-ipc = "0.9"
futures = "0.3"
-tokio = { version = "1.8", features = [ "rt" ] }
+tokio = { version = "1.8", features = ["rt"] }
log = "0.4"
[target.'cfg(unix)'.dependencies]
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index 9d0e638425..2cdad1e00a 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -16,7 +16,7 @@ lazy_static = "1.0"
log = "0.4"
regex = "1.0"
uuid = { version = "0.8", features = ["v4"] }
-tokio = { version = "1.8", features = [ "rt" ] }
+tokio = { version = "1.8", features = ["rt"] }
mullvad-paths = { path = "../mullvad-paths" }
mullvad-rpc = { path = "../mullvad-rpc" }
diff --git a/mullvad-rpc/Cargo.toml b/mullvad-rpc/Cargo.toml
index 88d47d25aa..6fdf3e3400 100644
--- a/mullvad-rpc/Cargo.toml
+++ b/mullvad-rpc/Cargo.toml
@@ -24,7 +24,7 @@ regex = "1"
serde = "1"
serde_json = "1.0"
hyper-rustls = "0.23"
-tokio = { version = "1.8", features = [ "macros", "time", "rt-multi-thread", "net", "io-std", "io-util", "fs" ] }
+tokio = { version = "1.8", features = ["macros", "time", "rt-multi-thread", "net", "io-std", "io-util", "fs"] }
tokio-rustls = "0.23"
rustls-pemfile = "0.2"
urlencoding = "1"
diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml
index 9cb46e37c0..66fcc19085 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -19,7 +19,7 @@ lazy_static = "1.1.0"
mullvad-management-interface = { path = "../mullvad-management-interface" }
-tokio = { version = "1.8", features = [ "rt-multi-thread" ] }
+tokio = { version = "1.8", features = ["rt-multi-thread"] }
mullvad-daemon = { path = "../mullvad-daemon" }
mullvad-paths = { path = "../mullvad-paths" }
@@ -29,7 +29,7 @@ talpid-core = { path = "../talpid-core" }
talpid-types = { path = "../talpid-types" }
[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.6", features = [ "securitybaseapi", "impl-default", "impl-debug", "handleapi", "psapi" ]}
+winapi = { version = "0.3.6", features = ["securitybaseapi", "impl-default", "impl-debug", "handleapi", "psapi"]}
widestring = "0.5"
[target.'cfg(windows)'.build-dependencies]
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index f01682f08c..9dd56ac5c0 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -28,11 +28,11 @@ talpid-types = { path = "../talpid-types" }
uuid = { version = "0.8", features = ["v4"] }
zeroize = "1"
chrono = "0.4.19"
-tokio = { version = "1.8", features = [ "process", "rt-multi-thread", "fs" ] }
-tokio-stream = { version = "0.1", features = [ "io-util" ] }
+tokio = { version = "1.8", features = ["process", "rt-multi-thread", "fs"] }
+tokio-stream = { version = "0.1", features = ["io-util"] }
rand = "0.7"
udp-over-tcp = { git = "https://github.com/mullvad/udp-over-tcp", rev = "1e27324362ed123b61fa2062b1599e5f9d569796" }
-socket2 = { version = "0.4.2", features = [ "all" ] }
+socket2 = { version = "0.4.2", features = ["all"] }
[target.'cfg(not(target_os="android"))'.dependencies]
parity-tokio-ipc = "0.9"
@@ -69,7 +69,7 @@ internet-checksum = "0.2"
[target.'cfg(target_os = "macos")'.dependencies]
pfctl = "0.4.4"
system-configuration = "0.5"
-trust-dns-server = { version = "0.21.0-alpha.5", features = [ "trust-dns-resolver" ] }
+trust-dns-server = { version = "0.21.0-alpha.5", features = ["trust-dns-resolver"] }
tun = "0.5.1"
subslice = "0.2"
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index 667fe12dba..3415633f0b 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -15,7 +15,7 @@ err-derive = "0.3.1"
log = "0.4"
env_logger = "0.8.2"
parity-tokio-ipc = "0.9"
-tokio = { version = "1.8", features = [ "rt" ] }
+tokio = { version = "1.8", features = ["rt"] }
openvpn-plugin = { version = "0.4", features = ["serde", "log", "auth-failed-event"] }
talpid-types = { path = "../talpid-types" }
diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml
index 8275e054b0..0bc1f1c3b8 100644
--- a/talpid-types/Cargo.toml
+++ b/talpid-types/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
serde = { version = "1.0", features = ["derive"] }
ipnetwork = "0.16"
base64 = "0.13"
-x25519-dalek = { version = "1.1", features = [ "std", "u64_backend" ], default-features = false }
+x25519-dalek = { version = "1.1", features = ["std", "u64_backend"], default-features = false }
rand = "0.7"
err-derive = "0.3.1"