diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-03-06 23:48:54 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-03-06 23:49:17 +0100 |
| commit | 57644f2d5a1eeba6dede6cd3db490c2bb38ad1f2 (patch) | |
| tree | 471feba666833135546828c0d66c5cf49ac56c51 | |
| parent | 2ae706231d6fc09f61d2eda5fc15c5b6596dde3c (diff) | |
| download | mullvadvpn-57644f2d5a1eeba6dede6cd3db490c2bb38ad1f2.tar.xz mullvadvpn-57644f2d5a1eeba6dede6cd3db490c2bb38ad1f2.zip | |
Upgrade env_logger, duct, uuid and rand
| -rw-r--r-- | mullvad-cli/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-cli/src/main.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 4 | ||||
| -rw-r--r-- | talpid-core/Cargo.toml | 4 | ||||
| -rw-r--r-- | talpid-ipc/Cargo.toml | 2 | ||||
| -rw-r--r-- | talpid-ipc/tests/ipc-client-server.rs | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml index 6bc0aa7d1d..80439d921d 100644 --- a/mullvad-cli/Cargo.toml +++ b/mullvad-cli/Cargo.toml @@ -14,7 +14,7 @@ clap = "2.20" error-chain = "0.11" lazy_static = "1.0" log = "0.4" -env_logger = "0.4" +env_logger = "0.5" serde = "1.0" mullvad-types = { path = "../mullvad-types" } diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs index 3e3bf2d62e..be50513dca 100644 --- a/mullvad-cli/src/main.rs +++ b/mullvad-cli/src/main.rs @@ -35,7 +35,7 @@ error_chain! { quick_main!(run); fn run() -> Result<()> { - env_logger::init().chain_err(|| "Failed to bootstrap logging system")?; + env_logger::init(); let commands = cmds::get_commands(); diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index cf2531698d..026a5c47a3 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -20,9 +20,9 @@ jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } -uuid = { version = "0.5", features = ["v4"] } +uuid = { version = "0.6", features = ["v4"] } lazy_static = "1.0" -rand = "0.3" +rand = "0.4" tokio-core = "0.1" tokio-timer = "0.1" regex = "0.2" diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index 9f2dc1db32..e4bdf37187 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -6,13 +6,13 @@ description = "Core backend functionality of the Mullvad VPN client" license = "GPL-3.0" [dependencies] -duct = "0.9.1" +duct = "0.10" error-chain = "0.11" jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } lazy_static = "1.0" log = "0.4" -uuid = { version = "0.5", features = ["v4"] } +uuid = { version = "0.6", features = ["v4"] } shell-escape = "0.1" openvpn-plugin = { version = "0.3", features = ["serde"] } diff --git a/talpid-ipc/Cargo.toml b/talpid-ipc/Cargo.toml index 5c2027e7d2..79e164bb51 100644 --- a/talpid-ipc/Cargo.toml +++ b/talpid-ipc/Cargo.toml @@ -17,5 +17,5 @@ url = "1.4" [dev-dependencies] assert_matches = "1.0" -env_logger = "0.4" +env_logger = "0.5" jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } diff --git a/talpid-ipc/tests/ipc-client-server.rs b/talpid-ipc/tests/ipc-client-server.rs index ee4343caed..5817b13029 100644 --- a/talpid-ipc/tests/ipc-client-server.rs +++ b/talpid-ipc/tests/ipc-client-server.rs @@ -30,7 +30,7 @@ impl TestApi for ApiImpl { #[test] fn ipc_client_server() { - env_logger::init().unwrap(); + env_logger::init(); let (server, rx) = create_server(); let server_id = server.address().to_owned(); |