summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-05-23 15:25:49 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-05-23 15:25:49 +0200
commitb642c63dc281746cef24a59aa01f9d30ce441ca9 (patch)
tree63c1c854c8349400d6c50b01784053de00381e38
parent5c30d7757d295e280626173e33cf2ff3f9ad5550 (diff)
downloadmullvadvpn-b642c63dc281746cef24a59aa01f9d30ce441ca9.tar.xz
mullvadvpn-b642c63dc281746cef24a59aa01f9d30ce441ca9.zip
Fix formatting
-rw-r--r--talpid_core/src/tunnel/mod.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/talpid_core/src/tunnel/mod.rs b/talpid_core/src/tunnel/mod.rs
index 5de530746d..c453c52056 100644
--- a/talpid_core/src/tunnel/mod.rs
+++ b/talpid_core/src/tunnel/mod.rs
@@ -64,14 +64,14 @@ impl TunnelMonitor {
pub fn new<L>(on_event: L) -> Result<Self>
where L: Fn(TunnelEvent) + Send + Sync + 'static
{
- let openvpn_on_event = move |openvpn_event| {
- if let Some(tunnel_event) = TunnelEvent::from_openvpn_event(&openvpn_event) {
- on_event(tunnel_event);
- } else {
- debug!("Ignoring OpenVpnEvent {:?}", openvpn_event);
+ let on_openvpn_event = move |openvpn_event| {
+ // FIXME: This comment must be here to make rustfmt 0.8.3 not screw up.
+ match TunnelEvent::from_openvpn_event(&openvpn_event) {
+ Some(tunnel_event) => on_event(tunnel_event),
+ None => debug!("Ignoring OpenVpnEvent {:?}", openvpn_event),
}
};
- let monitor = openvpn::OpenVpnMonitor::new(openvpn_on_event, get_plugin_path())
+ let monitor = openvpn::OpenVpnMonitor::new(on_openvpn_event, get_plugin_path())
.chain_err(|| ErrorKind::TunnelMonitoringError)?;
Ok(TunnelMonitor { monitor })
}