diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-12-18 11:02:04 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-12-18 11:02:04 +0100 |
| commit | 7f15829f2dbed506150445cdf53ea6bc05fe9437 (patch) | |
| tree | 98997c8bd1e3e36b477df0ff8aa5112153e26eca /talpid-core | |
| parent | c53c07dcd8057533e690e062c0aafc6547992dfa (diff) | |
| parent | e6fbde01fcdfc6181015f71ce753a038a48509df (diff) | |
| download | mullvadvpn-7f15829f2dbed506150445cdf53ea6bc05fe9437.tar.xz mullvadvpn-7f15829f2dbed506150445cdf53ea6bc05fe9437.zip | |
Merge branch 'upgrade-dependencies'
Diffstat (limited to 'talpid-core')
| -rw-r--r-- | talpid-core/Cargo.toml | 2 | ||||
| -rw-r--r-- | talpid-core/src/firewall/mod.rs | 1 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/openvpn.rs | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index 32e36c9ed2..c52005a5ff 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -10,7 +10,7 @@ duct = "0.9.1" error-chain = "0.11" jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" } jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" } -lazy_static = "0.2" +lazy_static = "1.0" log = "0.3" uuid = { version = "0.5", features = ["v4"] } shell-escape = "0.1" diff --git a/talpid-core/src/firewall/mod.rs b/talpid-core/src/firewall/mod.rs index 17ba65b88d..c3115339f1 100644 --- a/talpid-core/src/firewall/mod.rs +++ b/talpid-core/src/firewall/mod.rs @@ -19,7 +19,6 @@ pub mod windows; use self::windows as imp; - error_chain!{ errors { /// Initialization error diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs index f2cc1da7da..f52240a3af 100644 --- a/talpid-core/src/tunnel/openvpn.rs +++ b/talpid-core/src/tunnel/openvpn.rs @@ -223,7 +223,6 @@ impl ProcessHandle for duct::Handle { } - mod event_server { use super::OpenVpnPluginEvent; use jsonrpc_core::{Error, IoHandler}; |