summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-11-14 06:20:26 +0100
committerLinus Färnstrand <linus@mullvad.net>2017-11-14 06:20:26 +0100
commit9b3308ae344aded5f2441af48fd660e23ed5d219 (patch)
treee5842406ad164f51a037b414c95039fbd8789679
parente9a97fd69fac26010741ae67066b1ea1b9d9eff6 (diff)
downloadmullvadvpn-9b3308ae344aded5f2441af48fd660e23ed5d219.tar.xz
mullvadvpn-9b3308ae344aded5f2441af48fd660e23ed5d219.zip
rustfmt
-rw-r--r--mullvad-daemon/src/main.rs11
1 files changed, 4 insertions, 7 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 4ab2ca911c..433b7e4320 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -66,8 +66,8 @@ use std::time::{Duration, Instant};
use talpid_core::firewall::{Firewall, FirewallProxy, SecurityPolicy};
use talpid_core::mpsc::IntoSender;
use talpid_core::tunnel::{self, TunnelEvent, TunnelMetadata, TunnelMonitor};
-use talpid_types::net::{Endpoint, TransportProtocol, TunnelEndpoint, TunnelEndpointData,
- OpenVpnEndpoint};
+use talpid_types::net::{Endpoint, OpenVpnEndpoint, TransportProtocol, TunnelEndpoint,
+ TunnelEndpointData};
error_chain!{
errors {
@@ -567,10 +567,7 @@ impl Daemon {
.chain_err(|| "Unable to construct a valid relay")?;
Ok(TunnelEndpoint {
address: endpoint.address.ip(),
- tunnel: TunnelEndpointData::OpenVpn(OpenVpnEndpoint {
- port,
- protocol,
- })
+ tunnel: TunnelEndpointData::OpenVpn(OpenVpnEndpoint { port, protocol }),
})
}
@@ -755,7 +752,7 @@ fn get_resource_dir() -> PathBuf {
}
Err(e) => {
error!(
- "Failed finding the directory of the executable. Using working directory: {}",
+ "Failed finding the install directory. Using working directory: {}",
e
);
PathBuf::from(".")