diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-09-27 15:36:13 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-09-27 15:36:13 +0200 |
| commit | e830dad2b1e00a2ef46382dfe71c80b0406686e8 (patch) | |
| tree | eb7db04951974780a61c0c4ad948c5e1c3b360fa /mullvad-tests/src | |
| parent | 00b0ba04092e97f3724260b943f3b138e8eb7b01 (diff) | |
| parent | 763d5e200947d616865ec3292c27347739d2d386 (diff) | |
| download | mullvadvpn-e830dad2b1e00a2ef46382dfe71c80b0406686e8.tar.xz mullvadvpn-e830dad2b1e00a2ef46382dfe71c80b0406686e8.zip | |
Merge branch 'update-rustfmt'
Diffstat (limited to 'mullvad-tests/src')
| -rw-r--r-- | mullvad-tests/src/lib.rs | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/mullvad-tests/src/lib.rs b/mullvad-tests/src/lib.rs index 6683eb9be1..2a10ff5f3f 100644 --- a/mullvad-tests/src/lib.rs +++ b/mullvad-tests/src/lib.rs @@ -176,11 +176,13 @@ impl Iterator for PathWatcher { path: Some(path), op: Ok(op), .. - }) => if path == self.path { - return Some(op); - } else { - continue; - }, + }) => { + if path == self.path { + return Some(op); + } else { + continue; + } + } Ok(_) => continue, Err(_) => return None, } @@ -263,7 +265,8 @@ fn prepare_relay_list<T: AsRef<Path>>(path: T) { }] }] }"#, - ).expect("Failed to create mock relay list file"); + ) + .expect("Failed to create mock relay list file"); } pub struct DaemonRunner { @@ -315,7 +318,8 @@ impl DaemonRunner { mullvad_ipc_client::new_standalone_transport(socket_path, |path| { IpcTransport::new(&path, &Handle::current()) .chain_err(|| mullvad_ipc_client::ErrorKind::TransportError) - }).map_err(|e| format!("Failed to construct an RPC client - {}", e)) + }) + .map_err(|e| format!("Failed to construct an RPC client - {}", e)) } #[cfg(unix)] @@ -372,7 +376,8 @@ impl MockOpenVpnPluginRpcClient { let result = IpcTransport::new(&address, &Handle::current()) .map_err(|error| { format!("Failed to create Mock OpenVPN plugin RPC client: {}", error) - }).map(Transport::into_client); + }) + .map(Transport::into_client); match result { Ok((client, client_handle)) => { tx.send(Ok(client_handle)).unwrap(); |
