summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-10-17 13:14:30 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-10-17 14:55:04 +0200
commit55674d9160cbc03bf9e20b16871e2870b1d0bb4c (patch)
treef408a0512db98d610381c1f50750fb3496f002f6 /mullvad-cli/src
parent818c435de10d27357a8c8afb481bce68d9fee894 (diff)
downloadmullvadvpn-55674d9160cbc03bf9e20b16871e2870b1d0bb4c.tar.xz
mullvadvpn-55674d9160cbc03bf9e20b16871e2870b1d0bb4c.zip
Upgrade err-derive to 0.2.1
Diffstat (limited to 'mullvad-cli/src')
-rw-r--r--mullvad-cli/src/main.rs12
1 files changed, 3 insertions, 9 deletions
diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs
index 4abe16224c..7547b0b1cd 100644
--- a/mullvad-cli/src/main.rs
+++ b/mullvad-cli/src/main.rs
@@ -23,25 +23,19 @@ pub type Result<T> = std::result::Result<T, Error>;
#[derive(err_derive::Error, Debug)]
pub enum Error {
#[error(display = "Failed to connect to daemon")]
- DaemonNotRunning(#[error(cause)] io::Error),
+ DaemonNotRunning(#[error(source)] io::Error),
#[error(display = "Can't subscribe to daemon states")]
- CantSubscribe(#[error(cause)] mullvad_ipc_client::PubSubError),
+ CantSubscribe(#[error(source)] mullvad_ipc_client::PubSubError),
#[error(display = "Failed to communicate with mullvad-daemon over RPC")]
- RpcClientError(#[error(cause)] mullvad_ipc_client::Error),
+ RpcClientError(#[error(source)] mullvad_ipc_client::Error),
/// The given command is not correct in some way
#[error(display = "Invalid command: {}", _0)]
InvalidCommand(&'static str),
}
-impl From<mullvad_ipc_client::Error> for Error {
- fn from(e: mullvad_ipc_client::Error) -> Self {
- Error::RpcClientError(e)
- }
-}
-
pub fn new_rpc_client() -> Result<DaemonRpcClient> {
match new_standalone_ipc_client(&mullvad_paths::get_rpc_socket_path()) {
Err(e) => Err(Error::DaemonNotRunning(e)),