summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src/rpc.rs
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-09-18 22:46:47 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-09-18 22:46:47 +0200
commit87a0ab01ae8f82ea7f7592b4b59899e479391419 (patch)
tree3562177e2a6c567d82e031e2aba3f6c60b6710d4 /mullvad-cli/src/rpc.rs
parent5977ca669756600bc39c7148f16e79a2569c36d4 (diff)
downloadmullvadvpn-87a0ab01ae8f82ea7f7592b4b59899e479391419.tar.xz
mullvadvpn-87a0ab01ae8f82ea7f7592b4b59899e479391419.zip
Run rustfmt-nightly 0.2.6 on everything
Diffstat (limited to 'mullvad-cli/src/rpc.rs')
-rw-r--r--mullvad-cli/src/rpc.rs17
1 files changed, 10 insertions, 7 deletions
diff --git a/mullvad-cli/src/rpc.rs b/mullvad-cli/src/rpc.rs
index d6569878cd..bd1d6e571b 100644
--- a/mullvad-cli/src/rpc.rs
+++ b/mullvad-cli/src/rpc.rs
@@ -6,21 +6,24 @@ use std::path::{Path, PathBuf};
use talpid_ipc::WsIpcClient;
pub fn call<T, O>(method: &str, args: &T) -> Result<O>
- where T: serde::Serialize,
- O: for<'de> serde::Deserialize<'de>
+where
+ T: serde::Serialize,
+ O: for<'de> serde::Deserialize<'de>,
{
call_internal(method, args).chain_err(|| "Unable to call backend over RPC")
}
pub fn call_internal<T, O>(method: &str, args: &T) -> Result<O>
- where T: serde::Serialize,
- O: for<'de> serde::Deserialize<'de>
+where
+ T: serde::Serialize,
+ O: for<'de> serde::Deserialize<'de>,
{
let address = read_rpc_address().chain_err(|| "Unable to read RPC address")?;
info!("Using RPC address {}", address);
- let mut rpc_client = WsIpcClient::new(address)
- .chain_err(|| "Unable to create RPC client")?;
- rpc_client.call(method, args).chain_err(|| format!("Unable to call RPC method {}", method))
+ let mut rpc_client = WsIpcClient::new(address).chain_err(|| "Unable to create RPC client")?;
+ rpc_client
+ .call(method, args)
+ .chain_err(|| format!("Unable to call RPC method {}", method))
}