Convert errors in CLI away from error-chain

2 files changed, 8 insertions, 8 deletions

diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 33783d309f..7a202e4a5d 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -1,4 +1,4 @@
-use crate::{new_rpc_client, Command, Result, ResultExt};
+use crate::{new_rpc_client, Command, Error, Result};
 use clap::{value_t, values_t};
 use std::{
     io::{self, BufRead},
@@ -335,7 +335,7 @@ impl Relay {
         match vpn_protocol {
             "wireguard" => {
                 if let Constraint::Only(TransportProtocol::Tcp) = protocol {
-                    return Err("WireGuard does not support TCP".into());
+                    return Err(Error::InvalidCommand("WireGuard does not support TCP"));
                 }
                 self.update_constraints(RelaySettingsUpdate::Normal(RelayConstraintsUpdate {
                     location: None,
@@ -393,9 +393,9 @@ impl Relay {
 fn parse_port_constraint(raw_port: &str) -> Result<Constraint<u16>> {
     match raw_port.to_lowercase().as_str() {
         "any" => Ok(Constraint::Any),
-        port => Ok(Constraint::Only(
-            u16::from_str(port).chain_err(|| "Invalid port")?,
-        )),
+        port => Ok(Constraint::Only(u16::from_str(port).map_err(|_| {
+            Error::InvalidCommand("Invalid port. Must be \"any\" or [0-65535].")
+        })?)),
     }
 }
 
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::*;