diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-04-08 17:52:19 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-04-08 17:52:19 +0200 |
| commit | 44be4c480845ecb43607dbcdc0e5c497b7eab98a (patch) | |
| tree | 5cf8ee0e69520f92d0b5180c791fa451b1773548 /mullvad-cli/src | |
| parent | 471a3fe5a74c9924b66994175919ff7472e7fdcb (diff) | |
| download | mullvadvpn-44be4c480845ecb43607dbcdc0e5c497b7eab98a.tar.xz mullvadvpn-44be4c480845ecb43607dbcdc0e5c497b7eab98a.zip | |
Remove error-chain from mullvad-ipc-client
Diffstat (limited to 'mullvad-cli/src')
| -rw-r--r-- | mullvad-cli/src/cmds/connect.rs | 2 | ||||
| -rw-r--r-- | mullvad-cli/src/main.rs | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/mullvad-cli/src/cmds/connect.rs b/mullvad-cli/src/cmds/connect.rs index 422b207c33..89cc0f2d2e 100644 --- a/mullvad-cli/src/cmds/connect.rs +++ b/mullvad-cli/src/cmds/connect.rs @@ -1,5 +1,5 @@ use crate::{new_rpc_client, Command, Result}; -use error_chain::ChainedError; +use talpid_types::ErrorExt; pub struct Connect; diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs index 389d98506c..e4fde0c211 100644 --- a/mullvad-cli/src/main.rs +++ b/mullvad-cli/src/main.rs @@ -12,9 +12,9 @@ extern crate error_chain; use clap::{crate_authors, crate_description, crate_name}; -use error_chain::ChainedError; use mullvad_ipc_client::{new_standalone_ipc_client, DaemonRpcClient}; use std::io; +use talpid_types::ErrorExt; mod cmds; @@ -24,7 +24,7 @@ pub const PRODUCT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/produc error_chain! { errors { - DaemonNotRunning(err: mullvad_ipc_client::Error) { + DaemonNotRunning(err: io::Error) { description("Failed to connect to daemon") display("Failed to connect to daemon: {}Is the daemon running?", err.display_chain()) } @@ -36,10 +36,7 @@ error_chain! { foreign_links { Io(io::Error); ParseIntError(::std::num::ParseIntError); - } - - links { - RpcClientError(mullvad_ipc_client::Error, mullvad_ipc_client::ErrorKind); + RpcClientError(mullvad_ipc_client::Error); } } |
