summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--talpid-core/src/firewall/linux.rs2
-rw-r--r--talpid-core/src/firewall/macos.rs2
-rw-r--r--talpid-core/src/firewall/mod.rs4
-rw-r--r--talpid-core/src/firewall/windows.rs2
-rw-r--r--talpid-core/src/linux.rs5
-rw-r--r--talpid-core/src/tunnel_state_machine/connecting_state.rs2
-rw-r--r--talpid-core/src/tunnel_state_machine/mod.rs2
7 files changed, 11 insertions, 8 deletions
diff --git a/talpid-core/src/firewall/linux.rs b/talpid-core/src/firewall/linux.rs
index a60644ee7f..2743b9d318 100644
--- a/talpid-core/src/firewall/linux.rs
+++ b/talpid-core/src/firewall/linux.rs
@@ -1,4 +1,4 @@
-use super::{FirewallT, FirewallPolicy};
+use super::{FirewallPolicy, FirewallT};
use crate::tunnel;
use ipnetwork::IpNetwork;
use lazy_static::lazy_static;
diff --git a/talpid-core/src/firewall/macos.rs b/talpid-core/src/firewall/macos.rs
index 6ffdd28df0..8f05f359fa 100644
--- a/talpid-core/src/firewall/macos.rs
+++ b/talpid-core/src/firewall/macos.rs
@@ -1,4 +1,4 @@
-use super::{FirewallT, FirewallPolicy};
+use super::{FirewallPolicy, FirewallT};
use pfctl::FilterRuleAction;
use std::{
env,
diff --git a/talpid-core/src/firewall/mod.rs b/talpid-core/src/firewall/mod.rs
index 2bdb58f27c..e932a8ea09 100644
--- a/talpid-core/src/firewall/mod.rs
+++ b/talpid-core/src/firewall/mod.rs
@@ -2,9 +2,9 @@
use ipnetwork::{IpNetwork, Ipv4Network, Ipv6Network};
#[cfg(unix)]
use lazy_static::lazy_static;
-#[cfg(unix)]
-use std::net::{Ipv4Addr, Ipv6Addr, IpAddr};
use std::fmt;
+#[cfg(unix)]
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
use talpid_types::net::Endpoint;
diff --git a/talpid-core/src/firewall/windows.rs b/talpid-core/src/firewall/windows.rs
index 157f5a7061..5fc0514d36 100644
--- a/talpid-core/src/firewall/windows.rs
+++ b/talpid-core/src/firewall/windows.rs
@@ -1,7 +1,7 @@
use std::{net::IpAddr, ptr};
use self::winfw::*;
-use super::{FirewallT, FirewallPolicy};
+use super::{FirewallPolicy, FirewallT};
use crate::winnet;
use log::{debug, error, trace};
use talpid_types::net::Endpoint;
diff --git a/talpid-core/src/linux.rs b/talpid-core/src/linux.rs
index 2822d5837b..c1e3a97e07 100644
--- a/talpid-core/src/linux.rs
+++ b/talpid-core/src/linux.rs
@@ -1,4 +1,7 @@
-use std::{ffi::{self, CString}, io};
+use std::{
+ ffi::{self, CString},
+ io,
+};
/// Converts an interface name into the corresponding index.
pub fn iface_index(name: &str) -> Result<libc::c_uint, IfaceIndexLookupError> {
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index 06547e6446..b5b4cb10a4 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -22,8 +22,8 @@ use super::{
TunnelStateWrapper,
};
use crate::{
- logging,
firewall::FirewallPolicy,
+ logging,
tunnel::{self, CloseHandle, TunnelEvent, TunnelMetadata, TunnelMonitor},
};
diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs
index cbb7303129..19d0cc707f 100644
--- a/talpid-core/src/tunnel_state_machine/mod.rs
+++ b/talpid-core/src/tunnel_state_machine/mod.rs
@@ -29,7 +29,7 @@ use self::{
disconnected_state::DisconnectedState,
disconnecting_state::{AfterDisconnect, DisconnectingState},
};
-use crate::{dns::DnsMonitor, mpsc::IntoSender, offline, firewall::Firewall};
+use crate::{dns::DnsMonitor, firewall::Firewall, mpsc::IntoSender, offline};
error_chain! {
errors {