diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-19 19:12:39 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-03 12:30:32 +0000 |
| commit | a7e93ec7745ccca9d90ab0099dcab2c76fe32b03 (patch) | |
| tree | 3944825e3c961df52e453d39cadbba9e81a9292f | |
| parent | cfccf766a6e5f91c3e5298db63f7a4790ecd6ea0 (diff) | |
| download | mullvadvpn-a7e93ec7745ccca9d90ab0099dcab2c76fe32b03.tar.xz mullvadvpn-a7e93ec7745ccca9d90ab0099dcab2c76fe32b03.zip | |
Make `TunProvider`s have the same constructor name
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/tun_provider/stub.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/tun_provider/unix.rs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index b0387e494c..55ebe7eb38 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -434,7 +434,7 @@ where account_history::AccountHistory::new(&cache_dir).map_err(Error::LoadAccountHistory)?; #[cfg(not(target_os = "android"))] - let tun_provider = PlatformTunProvider::default(); + let tun_provider = PlatformTunProvider::new(); let tunnel_parameters_generator = MullvadTunnelParametersGenerator { tx: internal_event_tx.clone(), diff --git a/talpid-core/src/tunnel/tun_provider/stub.rs b/talpid-core/src/tunnel/tun_provider/stub.rs index 3cd6dd0ee8..76f3f9d05f 100644 --- a/talpid-core/src/tunnel/tun_provider/stub.rs +++ b/talpid-core/src/tunnel/tun_provider/stub.rs @@ -4,8 +4,8 @@ use talpid_types::BoxedError; /// Factory stub of tunnel devices. pub struct StubTunProvider; -impl Default for StubTunProvider { - fn default() -> Self { +impl StubTunProvider { + fn new() -> Self { StubTunProvider } } diff --git a/talpid-core/src/tunnel/tun_provider/unix.rs b/talpid-core/src/tunnel/tun_provider/unix.rs index 4e05505348..2c10cd8f28 100644 --- a/talpid-core/src/tunnel/tun_provider/unix.rs +++ b/talpid-core/src/tunnel/tun_provider/unix.rs @@ -23,8 +23,8 @@ pub enum Error { /// Factory of tunnel devices on Unix systems. pub struct UnixTunProvider; -impl Default for UnixTunProvider { - fn default() -> Self { +impl UnixTunProvider { + fn new() -> Self { UnixTunProvider } } |
