Format workspace

The 2024 edition contains new formatting rules.
All of these are not compatible with the 2021
formatting style, but most of them are.

To change the formatting to be as close to the
new style as possible while remaining compatible
with the 2021 edition, I first ran
`cargo +beta fmt` with the edition set to 2024,
then, with the edition set to 2021, I ran
`cargo fmt`.

25 files changed, 66 insertions, 63 deletions

diff --git a/mullvad-daemon/src/access_method.rs b/mullvad-daemon/src/access_method.rs
index a5980ec596..94f126a115 100644
--- a/mullvad-daemon/src/access_method.rs
+++ b/mullvad-daemon/src/access_method.rs
@@ -1,5 +1,5 @@
-use crate::{Daemon, api, settings};
-use mullvad_api::{ApiProxy, proxy::ApiConnectionMode, rest};
+use crate::{api, settings, Daemon};
+use mullvad_api::{proxy::ApiConnectionMode, rest, ApiProxy};
 use mullvad_types::{
     access_method::{self, AccessMethod, AccessMethodSetting},
     settings::Settings,
diff --git a/mullvad-daemon/src/android_dns.rs b/mullvad-daemon/src/android_dns.rs
index 8409edd6e3..5cbc9c271a 100644
--- a/mullvad-daemon/src/android_dns.rs
+++ b/mullvad-daemon/src/android_dns.rs
@@ -3,8 +3,8 @@
 
 use async_trait::async_trait;
 use hickory_resolver::{
-    TokioAsyncResolver,
     config::{NameServerConfigGroup, ResolverConfig, ResolverOpts},
+    TokioAsyncResolver,
 };
 use mullvad_api::DnsResolver;
 use std::{io, net::SocketAddr};
diff --git a/mullvad-daemon/src/api.rs b/mullvad-daemon/src/api.rs
index b37c628281..e07a5a7077 100644
--- a/mullvad-daemon/src/api.rs
+++ b/mullvad-daemon/src/api.rs
@@ -7,15 +7,15 @@
 use crate::DaemonCommand;
 use crate::DaemonEventSender;
 use futures::{
-    StreamExt,
     channel::{mpsc, oneshot},
+    StreamExt,
 };
 #[cfg(feature = "api-override")]
 use mullvad_api::ApiEndpoint;
 use mullvad_api::{
-    AddressCache,
     availability::ApiAvailability,
     proxy::{ApiConnectionMode, ConnectionModeProvider, ProxyConfig},
+    AddressCache,
 };
 use mullvad_encrypted_dns_proxy::state::EncryptedDnsProxyState;
 use mullvad_relay_selector::RelaySelector;
@@ -25,7 +25,7 @@ use mullvad_types::access_method::{
 use std::{net::SocketAddr, path::PathBuf};
 use talpid_core::mpsc::Sender;
 use talpid_types::net::{
-    AllowedClients, AllowedEndpoint, Connectivity, Endpoint, TransportProtocol, proxy::CustomProxy,
+    proxy::CustomProxy, AllowedClients, AllowedEndpoint, Connectivity, Endpoint, TransportProtocol,
 };
 
 pub enum Message {
diff --git a/mullvad-daemon/src/api_address_updater.rs b/mullvad-daemon/src/api_address_updater.rs
index d020038fca..de347daccb 100644
--- a/mullvad-daemon/src/api_address_updater.rs
+++ b/mullvad-daemon/src/api_address_updater.rs
@@ -2,7 +2,7 @@
 //! Mullvad API.
 #[cfg(feature = "api-override")]
 use mullvad_api::ApiEndpoint;
-use mullvad_api::{AddressCache, ApiProxy, rest::MullvadRestHandle};
+use mullvad_api::{rest::MullvadRestHandle, AddressCache, ApiProxy};
 use std::time::Duration;
 
 const API_IP_CHECK_INITIAL: Duration = Duration::from_secs(15 * 60);
diff --git a/mullvad-daemon/src/device/api.rs b/mullvad-daemon/src/device/api.rs
index 93cfba8851..714df2dfb3 100644
--- a/mullvad-daemon/src/device/api.rs
+++ b/mullvad-daemon/src/device/api.rs
@@ -1,7 +1,7 @@
 use std::pin::Pin;
 
 use chrono::{DateTime, Utc};
-use futures::{Future, future::FusedFuture};
+use futures::{future::FusedFuture, Future};
 #[cfg(target_os = "android")]
 use mullvad_types::account::PlayPurchasePaymentToken;
 use mullvad_types::{account::VoucherSubmission, device::Device, wireguard::WireguardData};
diff --git a/mullvad-daemon/src/device/mod.rs b/mullvad-daemon/src/device/mod.rs
index 7b0649a4d9..e6e89d8b24 100644
--- a/mullvad-daemon/src/device/mod.rs
+++ b/mullvad-daemon/src/device/mod.rs
@@ -19,16 +19,16 @@ use std::{
     future::Future,
     path::Path,
     sync::{
-        Arc,
         atomic::{AtomicBool, Ordering},
+        Arc,
     },
     time::{Duration, SystemTime},
 };
 use talpid_core::mpsc::Sender;
 use talpid_types::{
-    ErrorExt,
     net::{TunnelEndpoint, TunnelType},
     tunnel::TunnelStateTransition,
+    ErrorExt,
 };
 use tokio::{
     fs,
@@ -1385,8 +1385,8 @@ impl TunnelStateChangeHandler {
 #[cfg(test)]
 mod test {
     use std::sync::{
-        Arc,
         atomic::{AtomicBool, Ordering},
+        Arc,
     };
     use talpid_types::tunnel::TunnelStateTransition;
 
diff --git a/mullvad-daemon/src/device/service.rs b/mullvad-daemon/src/device/service.rs
index 32dc1bb4e1..3ebecf0483 100644
--- a/mullvad-daemon/src/device/service.rs
+++ b/mullvad-daemon/src/device/service.rs
@@ -1,7 +1,7 @@
 use std::{future::Future, time::Duration};
 
 use chrono::Utc;
-use futures::future::{AbortHandle, abortable};
+use futures::future::{abortable, AbortHandle};
 #[cfg(target_os = "android")]
 use mullvad_types::account::{PlayPurchase, PlayPurchasePaymentToken};
 use mullvad_types::{
@@ -13,11 +13,11 @@ use talpid_types::net::wireguard::PrivateKey;
 
 use super::{Error, PrivateAccountAndDevice, PrivateDevice};
 use mullvad_api::{
-    AccountsProxy, DevicesProxy,
     availability::ApiAvailability,
     rest::{self, MullvadRestHandle},
+    AccountsProxy, DevicesProxy,
 };
-use talpid_future::retry::{ConstantInterval, ExponentialBackoff, Jittered, retry_future};
+use talpid_future::retry::{retry_future, ConstantInterval, ExponentialBackoff, Jittered};
 /// Retry strategy used for user-initiated actions that require immediate feedback
 const RETRY_ACTION_STRATEGY: ConstantInterval = ConstantInterval::new(Duration::ZERO, Some(3));
 /// Retry strategy used for background tasks
diff --git a/mullvad-daemon/src/exception_logging/unix.rs b/mullvad-daemon/src/exception_logging/unix.rs
index 7b8940b984..b956db8319 100644
--- a/mullvad-daemon/src/exception_logging/unix.rs
+++ b/mullvad-daemon/src/exception_logging/unix.rs
@@ -2,17 +2,17 @@
 #![warn(clippy::undocumented_unsafe_blocks)]
 
 use libc::siginfo_t;
-use nix::sys::signal::{SaFlags, SigAction, SigHandler, SigSet, Signal, sigaction};
+use nix::sys::signal::{sigaction, SaFlags, SigAction, SigHandler, SigSet, Signal};
 
 use core::fmt;
 use std::{
     backtrace::Backtrace,
     env,
-    ffi::{CString, c_int, c_void},
+    ffi::{c_int, c_void, CString},
     os::fd::{FromRawFd, RawFd},
     sync::{
-        Once, OnceLock,
         atomic::{AtomicBool, Ordering},
+        Once, OnceLock,
     },
 };
 
diff --git a/mullvad-daemon/src/exception_logging/win.rs b/mullvad-daemon/src/exception_logging/win.rs
index 9687de8db9..3fa50aa506 100644
--- a/mullvad-daemon/src/exception_logging/win.rs
+++ b/mullvad-daemon/src/exception_logging/win.rs
@@ -17,8 +17,8 @@ use windows_sys::Win32::{
     System::{
         Diagnostics::{
             Debug::{
-                CONTEXT, EXCEPTION_POINTERS, EXCEPTION_RECORD, MINIDUMP_EXCEPTION_INFORMATION,
-                MiniDumpNormal, MiniDumpWriteDump, SetUnhandledExceptionFilter,
+                MiniDumpNormal, MiniDumpWriteDump, SetUnhandledExceptionFilter, CONTEXT,
+                EXCEPTION_POINTERS, EXCEPTION_RECORD, MINIDUMP_EXCEPTION_INFORMATION,
             },
             ToolHelp::TH32CS_SNAPMODULE,
         },
diff --git a/mullvad-daemon/src/geoip.rs b/mullvad-daemon/src/geoip.rs
index 09d52ba824..815b83b13f 100644
--- a/mullvad-daemon/src/geoip.rs
+++ b/mullvad-daemon/src/geoip.rs
@@ -5,7 +5,7 @@ use mullvad_api::rest::{Error, RequestServiceHandle};
 use mullvad_types::location::{AmIMullvad, GeoIpLocation, LocationEventData};
 use std::sync::LazyLock;
 use talpid_core::mpsc::Sender;
-use talpid_future::retry::{ExponentialBackoff, Jittered, retry_future};
+use talpid_future::retry::{retry_future, ExponentialBackoff, Jittered};
 use talpid_types::ErrorExt;
 
 use crate::{DaemonEventSender, InternalDaemonEvent};
diff --git a/mullvad-daemon/src/leak_checker/mod.rs b/mullvad-daemon/src/leak_checker/mod.rs
index 625c094290..e24c2358fe 100644
--- a/mullvad-daemon/src/leak_checker/mod.rs
+++ b/mullvad-daemon/src/leak_checker/mod.rs
@@ -1,4 +1,4 @@
-use futures::{FutureExt, select};
+use futures::{select, FutureExt};
 pub use mullvad_leak_checker::LeakInfo;
 use std::time::Duration;
 use talpid_routing::RouteManagerHandle;
@@ -167,8 +167,8 @@ async fn check_for_leaks(
     route_manager: &RouteManagerHandle,
     destination: Endpoint,
 ) -> anyhow::Result<Option<LeakInfo>> {
-    use anyhow::{Context, anyhow};
-    use mullvad_leak_checker::{LeakStatus, traceroute::TracerouteOpt};
+    use anyhow::{anyhow, Context};
+    use mullvad_leak_checker::{traceroute::TracerouteOpt, LeakStatus};
 
     #[cfg(target_os = "linux")]
     let interface = {
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 7fd3411fa8..1da90693fc 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -34,9 +34,9 @@ use crate::target_state::PersistentTargetState;
 use api::AccessMethodEvent;
 use device::{AccountEvent, PrivateAccountAndDevice, PrivateDeviceEvent};
 use futures::{
-    StreamExt,
     channel::{mpsc, oneshot},
-    future::{AbortHandle, Future, abortable},
+    future::{abortable, AbortHandle, Future},
+    StreamExt,
 };
 use geoip::GeoIpHandler;
 use leak_checker::{LeakChecker, LeakInfo};
@@ -55,7 +55,7 @@ use mullvad_types::{
     auth_failed::AuthFailed,
     custom_list::CustomList,
     device::{Device, DeviceEvent, DeviceEventCause, DeviceId, DeviceState, RemoveDeviceEvent},
-    features::{FeatureIndicator, FeatureIndicators, compute_feature_indicators},
+    features::{compute_feature_indicators, FeatureIndicator, FeatureIndicators},
     location::{GeoIpLocation, LocationEventData},
     relay_constraints::{
         BridgeSettings, BridgeState, BridgeType, ObfuscationSettings, RelayOverride, RelaySettings,
@@ -66,7 +66,7 @@ use mullvad_types::{
     version::{AppVersion, AppVersionInfo},
     wireguard::{PublicKey, QuantumResistantState, RotationInterval},
 };
-use relay_list::{RELAYS_FILENAME, RelayListUpdater, RelayListUpdaterHandle};
+use relay_list::{RelayListUpdater, RelayListUpdaterHandle, RELAYS_FILENAME};
 use settings::SettingsPersister;
 #[cfg(any(windows, target_os = "android", target_os = "macos"))]
 use std::collections::HashSet;
@@ -90,9 +90,9 @@ use talpid_types::android::AndroidContext;
 #[cfg(target_os = "windows")]
 use talpid_types::split_tunnel::ExcludedProcess;
 use talpid_types::{
-    ErrorExt,
     net::{IpVersion, TunnelType},
     tunnel::{ErrorStateCause, TunnelStateTransition},
+    ErrorExt,
 };
 use tokio::io;
 
@@ -2465,7 +2465,7 @@ impl Daemon {
 
     #[cfg(daita)]
     async fn on_set_daita_enabled(&mut self, tx: ResponseTx<(), settings::Error>, value: bool) {
-        use mullvad_types::{Intersection, constraints::Constraint};
+        use mullvad_types::{constraints::Constraint, Intersection};
 
         let result = self
             .settings
@@ -2504,7 +2504,7 @@ impl Daemon {
         tx: ResponseTx<(), settings::Error>,
         value: bool,
     ) {
-        use mullvad_types::{Intersection, constraints::Constraint};
+        use mullvad_types::{constraints::Constraint, Intersection};
 
         match self
             .settings
diff --git a/mullvad-daemon/src/logging.rs b/mullvad-daemon/src/logging.rs
index 9f98dda394..6e91e86ea6 100644
--- a/mullvad-daemon/src/logging.rs
+++ b/mullvad-daemon/src/logging.rs
@@ -1,6 +1,6 @@
 use fern::{
-    Output,
     colors::{Color, ColoredLevelConfig},
+    Output,
 };
 use std::{
     fmt, io,
diff --git a/mullvad-daemon/src/macos_launch_daemon.rs b/mullvad-daemon/src/macos_launch_daemon.rs
index 4b46c5bb0a..0c9c89080c 100644
--- a/mullvad-daemon/src/macos_launch_daemon.rs
+++ b/mullvad-daemon/src/macos_launch_daemon.rs
@@ -6,7 +6,7 @@
 //! daemon in the system settings.
 
 use libc::c_longlong;
-use objc2::{Encode, Encoding, RefEncode, class, msg_send, runtime::AnyObject};
+use objc2::{class, msg_send, runtime::AnyObject, Encode, Encoding, RefEncode};
 use std::ffi::CStr;
 
 type Id = *mut AnyObject;
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index f20ee3c816..c2146752c7 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -3,8 +3,8 @@ use std::{path::PathBuf, thread, time::Duration};
 #[cfg(not(windows))]
 use mullvad_daemon::cleanup_old_rpc_socket;
 use mullvad_daemon::{
-    Daemon, DaemonCommandChannel, DaemonConfig, exception_logging, logging, rpc_uniqueness_check,
-    runtime, version,
+    exception_logging, logging, rpc_uniqueness_check, runtime, version, Daemon,
+    DaemonCommandChannel, DaemonConfig,
 };
 use talpid_types::ErrorExt;
 
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 86af3eb676..8249aea968 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -1,12 +1,12 @@
-use crate::{DaemonCommand, DaemonCommandSender, account_history, device, version_check};
+use crate::{account_history, device, version_check, DaemonCommand, DaemonCommandSender};
 use futures::{
-    StreamExt,
     channel::{mpsc, oneshot},
+    StreamExt,
 };
-use mullvad_api::{StatusCode, rest::Error as RestError};
+use mullvad_api::{rest::Error as RestError, StatusCode};
 use mullvad_management_interface::{
-    Code, Request, Response, ServerJoinHandle, Status,
     types::{self, daemon_event, management_service_server::ManagementService},
+    Code, Request, Response, ServerJoinHandle, Status,
 };
 use mullvad_types::{
     account::AccountNumber,
diff --git a/mullvad-daemon/src/migrations/device.rs b/mullvad-daemon/src/migrations/device.rs
index efbf926e83..d5c05c9353 100644
--- a/mullvad-daemon/src/migrations/device.rs
+++ b/mullvad-daemon/src/migrations/device.rs
@@ -6,10 +6,10 @@
 //! This module is allowed to import a number of types, unlike other migration modules, as it
 //! does not modify any files directly and may safely fail.
 
-use super::{MigrationComplete, v5::MigrationData};
+use super::{v5::MigrationData, MigrationComplete};
 use crate::{
-    DaemonEventSender, InternalDaemonEvent,
     device::{self, DeviceService, PrivateAccountAndDevice, PrivateDevice},
+    DaemonEventSender, InternalDaemonEvent,
 };
 use mullvad_types::{account::AccountNumber, wireguard::WireguardData};
 use std::time::Duration;
diff --git a/mullvad-daemon/src/migrations/mod.rs b/mullvad-daemon/src/migrations/mod.rs
index 20dca54820..635c2f6ebe 100644
--- a/mullvad-daemon/src/migrations/mod.rs
+++ b/mullvad-daemon/src/migrations/mod.rs
@@ -34,8 +34,8 @@
 use std::{
     path::Path,
     sync::{
-        Arc,
         atomic::{AtomicBool, Ordering},
+        Arc,
     },
 };
 use tokio::{
@@ -231,11 +231,11 @@ mod windows {
     use talpid_types::ErrorExt;
     use tokio::fs;
     use windows_sys::Win32::{
-        Foundation::{ERROR_SUCCESS, HLOCAL, LocalFree, PSID},
+        Foundation::{LocalFree, ERROR_SUCCESS, HLOCAL, PSID},
         Security::{
             Authorization::{GetNamedSecurityInfoW, SE_FILE_OBJECT, SE_OBJECT_TYPE},
-            IsWellKnownSid, OWNER_SECURITY_INFORMATION, SECURITY_DESCRIPTOR, SID,
-            WELL_KNOWN_SID_TYPE, WinBuiltinAdministratorsSid, WinLocalSystemSid,
+            IsWellKnownSid, WinBuiltinAdministratorsSid, WinLocalSystemSid,
+            OWNER_SECURITY_INFORMATION, SECURITY_DESCRIPTOR, SID, WELL_KNOWN_SID_TYPE,
         },
     };
 
diff --git a/mullvad-daemon/src/migrations/v7.rs b/mullvad-daemon/src/migrations/v7.rs
index 0cc29df04e..47c6bf6275 100644
--- a/mullvad-daemon/src/migrations/v7.rs
+++ b/mullvad-daemon/src/migrations/v7.rs
@@ -7,8 +7,8 @@ use mullvad_types::{
 };
 use serde::{Deserialize, Serialize};
 use talpid_types::net::{
-    Endpoint, TransportProtocol,
     proxy::{CustomProxy, Shadowsocks, Socks5Local, Socks5Remote, SocksAuth},
+    Endpoint, TransportProtocol,
 };
 
 // ======================================================
diff --git a/mullvad-daemon/src/migrations/v9.rs b/mullvad-daemon/src/migrations/v9.rs
index f8ee03831b..1275c488e1 100644
--- a/mullvad-daemon/src/migrations/v9.rs
+++ b/mullvad-daemon/src/migrations/v9.rs
@@ -205,7 +205,7 @@ mod test {
     fn test_v9_to_v10_migration() {
         use crate::migrations::v9::{
             add_split_tunneling_settings,
-            test::constants::{V9_ANDROID_SETTINGS, V10_ANDROID_SETTINGS},
+            test::constants::{V10_ANDROID_SETTINGS, V9_ANDROID_SETTINGS},
         };
 
         let enabled = true;
diff --git a/mullvad-daemon/src/relay_list/mod.rs b/mullvad-daemon/src/relay_list/mod.rs
index 6126f113a0..ee5781aff0 100644
--- a/mullvad-daemon/src/relay_list/mod.rs
+++ b/mullvad-daemon/src/relay_list/mod.rs
@@ -1,9 +1,9 @@
 //! Relay list updater
 
 use futures::{
-    Future, FutureExt, SinkExt, StreamExt,
     channel::mpsc,
     future::{Fuse, FusedFuture},
+    Future, FutureExt, SinkExt, StreamExt,
 };
 use std::{
     path::{Path, PathBuf},
@@ -11,10 +11,10 @@ use std::{
 };
 use tokio::fs::File;
 
-use mullvad_api::{RelayListProxy, availability::ApiAvailability, rest::MullvadRestHandle};
+use mullvad_api::{availability::ApiAvailability, rest::MullvadRestHandle, RelayListProxy};
 use mullvad_relay_selector::RelaySelector;
 use mullvad_types::relay_list::RelayList;
-use talpid_future::retry::{ExponentialBackoff, Jittered, retry_future};
+use talpid_future::retry::{retry_future, ExponentialBackoff, Jittered};
 use talpid_types::ErrorExt;
 
 /// How often the updater should wake up to check the cache of the in-memory cache of relays.
diff --git a/mullvad-daemon/src/settings/mod.rs b/mullvad-daemon/src/settings/mod.rs
index 31c7d8874b..0b0d914569 100644
--- a/mullvad-daemon/src/settings/mod.rs
+++ b/mullvad-daemon/src/settings/mod.rs
@@ -398,7 +398,11 @@ pub struct SettingsSummary<'a> {
 impl Display for SettingsSummary<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let bool_to_label = |state| {
-            if state { "on" } else { "off" }
+            if state {
+                "on"
+            } else {
+                "off"
+            }
         };
 
         let relay_settings = self.settings.get_relay_settings();
diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs
index ec2ad3ff3a..ccec49486b 100644
--- a/mullvad-daemon/src/system_service.rs
+++ b/mullvad-daemon/src/system_service.rs
@@ -1,13 +1,12 @@
 use crate::cli;
-use mullvad_daemon::{DaemonShutdownHandle, runtime::new_multi_thread};
+use mullvad_daemon::{runtime::new_multi_thread, DaemonShutdownHandle};
 use std::{
     env,
-    ffi::{OsString, c_void},
+    ffi::{c_void, OsString},
     ptr, slice,
     sync::{
-        Arc, LazyLock,
         atomic::{AtomicBool, AtomicUsize, Ordering},
-        mpsc,
+        mpsc, Arc, LazyLock,
     },
     thread,
     time::{Duration, Instant},
diff --git a/mullvad-daemon/src/tunnel.rs b/mullvad-daemon/src/tunnel.rs
index 4f97207389..3fd94d591d 100644
--- a/mullvad-daemon/src/tunnel.rs
+++ b/mullvad-daemon/src/tunnel.rs
@@ -17,13 +17,13 @@ use std::sync::LazyLock;
 use talpid_core::tunnel_state_machine::TunnelParametersGenerator;
 #[cfg(not(target_os = "android"))]
 use talpid_types::net::{
-    Endpoint, TunnelParameters, obfuscation::ObfuscatorConfig, openvpn, proxy::CustomProxy,
-    wireguard,
+    obfuscation::ObfuscatorConfig, openvpn, proxy::CustomProxy, wireguard, Endpoint,
+    TunnelParameters,
 };
 #[cfg(target_os = "android")]
-use talpid_types::net::{TunnelParameters, obfuscation::ObfuscatorConfig, wireguard};
+use talpid_types::net::{obfuscation::ObfuscatorConfig, wireguard, TunnelParameters};
 
-use talpid_types::{ErrorExt, tunnel::ParameterGenerationError};
+use talpid_types::{tunnel::ParameterGenerationError, ErrorExt};
 
 use crate::device::{AccountManagerHandle, Error as DeviceError, PrivateAccountAndDevice};
 
diff --git a/mullvad-daemon/src/version_check.rs b/mullvad-daemon/src/version_check.rs
index 8e4578a9ea..1ee879ca1f 100644
--- a/mullvad-daemon/src/version_check.rs
+++ b/mullvad-daemon/src/version_check.rs
@@ -1,10 +1,10 @@
-use crate::{DaemonEventSender, version::is_beta_version};
+use crate::{version::is_beta_version, DaemonEventSender};
 use futures::{
-    FutureExt, SinkExt, StreamExt, TryFutureExt,
     channel::{mpsc, oneshot},
     future::{BoxFuture, FusedFuture},
+    FutureExt, SinkExt, StreamExt, TryFutureExt,
 };
-use mullvad_api::{AppVersionProxy, availability::ApiAvailability, rest::MullvadRestHandle};
+use mullvad_api::{availability::ApiAvailability, rest::MullvadRestHandle, AppVersionProxy};
 use mullvad_types::version::{AppVersionInfo, ParsedAppVersion};
 use serde::{Deserialize, Serialize};
 use std::{
@@ -18,7 +18,7 @@ use std::{
     time::{Duration, SystemTime},
 };
 use talpid_core::mpsc::Sender;
-use talpid_future::retry::{ConstantInterval, retry_future};
+use talpid_future::retry::{retry_future, ConstantInterval};
 use talpid_types::ErrorExt;
 use tokio::{fs::File, io::AsyncReadExt};
 
@@ -564,8 +564,8 @@ fn suggested_upgrade(
 #[cfg(test)]
 mod test {
     use std::sync::{
-        Arc,
         atomic::{AtomicBool, Ordering},
+        Arc,
     };
 
     use super::*;