diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-12-04 11:12:49 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-12-04 12:19:36 +0100 |
| commit | 6f3ea40d003400a4b5802f12e119805c7f9b3fb7 (patch) | |
| tree | 7cdd9f74729e1aa473ce0ecae121784073a293f1 /mullvad-daemon/src/management_interface.rs | |
| parent | 26d9f85b9c779ca18f935df9006ca6fad037aeb7 (diff) | |
| download | mullvadvpn-6f3ea40d003400a4b5802f12e119805c7f9b3fb7.tar.xz mullvadvpn-6f3ea40d003400a4b5802f12e119805c7f9b3fb7.zip | |
Upgrade rustfmt to 0.2.17
Diffstat (limited to 'mullvad-daemon/src/management_interface.rs')
| -rw-r--r-- | mullvad-daemon/src/management_interface.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs index 1f56d5ba0d..58f62b1ede 100644 --- a/mullvad-daemon/src/management_interface.rs +++ b/mullvad-daemon/src/management_interface.rs @@ -397,9 +397,9 @@ impl<T: From<TunnelCommand> + 'static + Send> ManagementInterfaceApi for Managem trace!("set_account"); try_future!(self.check_auth(&meta)); let (tx, rx) = sync::oneshot::channel(); - let future = self.send_command_to_daemon( - TunnelCommand::SetAccount(tx, account_token.clone()), - ).and_then(|_| rx.map_err(|_| Error::internal_error())); + let future = + self.send_command_to_daemon(TunnelCommand::SetAccount(tx, account_token.clone())) + .and_then(|_| rx.map_err(|_| Error::internal_error())); if let Some(new_account_token) = account_token { if let Err(e) = AccountHistory::load().and_then(|mut account_history| { @@ -521,9 +521,7 @@ impl<T: From<TunnelCommand> + 'static + Send> ManagementInterfaceApi for Managem try_future!(self.check_auth(&meta)); Box::new(future::result( AccountHistory::load() - .and_then(|mut account_history| { - account_history.remove_account_token(account_token) - }) + .and_then(|mut account_history| account_history.remove_account_token(account_token)) .map_err(|error| { error!( "Unable to remove account from history: {}", |