diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-04-11 16:41:15 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-04-15 15:17:28 +0200 |
| commit | 2fa4fc319fbe5271c733bb0ff1180efc73d55c2b (patch) | |
| tree | 2b5921aeb53753e6c0c96b1f165523a7739b1a03 /mullvad-cli/src/cmds/status.rs | |
| parent | b7fa77843763122e5f0355d606e265e23e3a97b6 (diff) | |
| download | mullvadvpn-2fa4fc319fbe5271c733bb0ff1180efc73d55c2b.tar.xz mullvadvpn-2fa4fc319fbe5271c733bb0ff1180efc73d55c2b.zip | |
Convert errors in CLI away from error-chain
Diffstat (limited to 'mullvad-cli/src/cmds/status.rs')
| -rw-r--r-- | mullvad-cli/src/cmds/status.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs index 9310707825..24adfb25f8 100644 --- a/mullvad-cli/src/cmds/status.rs +++ b/mullvad-cli/src/cmds/status.rs @@ -1,4 +1,4 @@ -use crate::{new_rpc_client, Command, Error, ErrorKind, Result, ResultExt}; +use crate::{new_rpc_client, Command, Error, Result}; use futures::{Future, Stream}; use mullvad_ipc_client::DaemonRpcClient; use mullvad_types::{auth_failed::AuthFailed, DaemonEvent}; @@ -36,9 +36,9 @@ impl Command for Status { let subscription = rpc .daemon_event_subscribe() .wait() - .map_err(|_err| Error::from(ErrorKind::CantSubscribe))?; + .map_err(Error::CantSubscribe)?; for event in subscription.wait() { - match event.chain_err(|| "Subscription failed")? { + match event? { DaemonEvent::StateTransition(new_state) => { print_state(&new_state); use self::TunnelStateTransition::*; |