Run `cargo fmt` in test-repo

18 files changed, 57 insertions, 55 deletions

diff --git a/test/test-manager/src/tests/access_methods.rs b/test/test-manager/src/tests/access_methods.rs
index bead7767f2..d7acbed9a7 100644
--- a/test/test-manager/src/tests/access_methods.rs
+++ b/test/test-manager/src/tests/access_methods.rs
@@ -7,7 +7,7 @@
 //! These tests rely on working proxies to exist *somewhere* for all tested protocols.
 //! If the proxies themselves are bad/not running, this test will fail due to issues
 //! that are out of the test manager's control.
-use anyhow::{anyhow, ensure, Context};
+use anyhow::{Context, anyhow, ensure};
 
 use mullvad_management_interface::MullvadProxyClient;
 use talpid_types::net::proxy::CustomProxy;
diff --git a/test/test-manager/src/tests/account.rs b/test/test-manager/src/tests/account.rs
index 29227cc82b..2fea7f7a93 100644
--- a/test/test-manager/src/tests/account.rs
+++ b/test/test-manager/src/tests/account.rs
@@ -1,9 +1,9 @@
-use crate::tests::helpers::{login_with_retries, THROTTLE_RETRY_DELAY};
+use crate::tests::helpers::{THROTTLE_RETRY_DELAY, login_with_retries};
 
-use super::{config::TEST_CONFIG, helpers, ui, Error, TestContext};
+use super::{Error, TestContext, config::TEST_CONFIG, helpers, ui};
 use anyhow::Context;
 use mullvad_api::DevicesProxy;
-use mullvad_management_interface::{client::DaemonEvent, MullvadProxyClient};
+use mullvad_management_interface::{MullvadProxyClient, client::DaemonEvent};
 use mullvad_types::{
     device::{Device, DeviceState},
     states::TunnelState,
@@ -278,7 +278,7 @@ pub async fn clear_devices(device_client: &DevicesProxy) -> anyhow::Result<()> {
 }
 
 pub async fn new_device_client() -> anyhow::Result<DevicesProxy> {
-    use mullvad_api::{proxy::ApiConnectionMode, ApiEndpoint};
+    use mullvad_api::{ApiEndpoint, proxy::ApiConnectionMode};
 
     let api_host = format!("api.{}", TEST_CONFIG.mullvad_host);
 
diff --git a/test/test-manager/src/tests/audits/cve_2019_14899.rs b/test/test-manager/src/tests/audits/cve_2019_14899.rs
index d723b84dd1..49fbf04d1a 100644
--- a/test/test-manager/src/tests/audits/cve_2019_14899.rs
+++ b/test/test-manager/src/tests/audits/cve_2019_14899.rs
@@ -21,8 +21,8 @@ use std::{
     time::Duration,
 };
 
-use anyhow::{anyhow, bail, Context};
-use futures::{select, FutureExt};
+use anyhow::{Context, anyhow, bail};
+use futures::{FutureExt, select};
 use mullvad_management_interface::MullvadProxyClient;
 use nix::{
     errno::Errno,
@@ -30,11 +30,11 @@ use nix::{
 };
 use pnet_base::MacAddr;
 use pnet_packet::{
+    MutablePacket, Packet,
     ethernet::{EtherTypes, EthernetPacket, MutableEthernetPacket},
     ip::IpNextHeaderProtocols,
     ipv4::{Ipv4Packet, MutableIpv4Packet},
     tcp::{MutableTcpPacket, TcpFlags, TcpPacket},
-    MutablePacket, Packet,
 };
 use socket2::Socket;
 use test_macro::test_function;
@@ -42,7 +42,7 @@ use test_rpc::ServiceClient;
 use tokio::{task::yield_now, time::sleep};
 
 use crate::{
-    tests::{config::TEST_CONFIG, helpers, TestContext},
+    tests::{TestContext, config::TEST_CONFIG, helpers},
     vm::network::linux::TAP_NAME,
 };
 
diff --git a/test/test-manager/src/tests/audits/mllvd_cr_24_03.rs b/test/test-manager/src/tests/audits/mllvd_cr_24_03.rs
index d82945d809..524785ee3d 100644
--- a/test/test-manager/src/tests/audits/mllvd_cr_24_03.rs
+++ b/test/test-manager/src/tests/audits/mllvd_cr_24_03.rs
@@ -29,7 +29,7 @@ use mullvad_management_interface::MullvadProxyClient;
 use test_macro::test_function;
 use test_rpc::ServiceClient;
 
-use crate::tests::{config::TEST_CONFIG, helpers::*, TestContext};
+use crate::tests::{TestContext, config::TEST_CONFIG, helpers::*};
 
 #[test_function(target_os = "linux")]
 pub async fn test_mllvd_cr_24_03(
diff --git a/test/test-manager/src/tests/audits/mul_02_002.rs b/test/test-manager/src/tests/audits/mul_02_002.rs
index a03afd91b9..f125d4c222 100644
--- a/test/test-manager/src/tests/audits/mul_02_002.rs
+++ b/test/test-manager/src/tests/audits/mul_02_002.rs
@@ -21,11 +21,11 @@ use mullvad_types::states::TunnelState;
 use test_macro::test_function;
 use test_rpc::ServiceClient;
 
-use crate::network_monitor::{start_packet_monitor, MonitorOptions, ParsedPacket};
+use crate::network_monitor::{MonitorOptions, ParsedPacket, start_packet_monitor};
+use crate::tests::TestContext;
 use crate::tests::helpers::{
-    connect_and_wait, constrain_to_relay, disconnect_and_wait, ConnChecker,
+    ConnChecker, connect_and_wait, constrain_to_relay, disconnect_and_wait,
 };
-use crate::tests::TestContext;
 
 #[test_function]
 pub async fn test_mul_02_002(
diff --git a/test/test-manager/src/tests/daita.rs b/test/test-manager/src/tests/daita.rs
index fb699fde7f..a3de0a93fa 100644
--- a/test/test-manager/src/tests/daita.rs
+++ b/test/test-manager/src/tests/daita.rs
@@ -1,6 +1,6 @@
-use anyhow::{anyhow, bail, ensure, Context};
+use anyhow::{Context, anyhow, bail, ensure};
 use futures::StreamExt;
-use mullvad_management_interface::{client::DaemonEvent, MullvadProxyClient};
+use mullvad_management_interface::{MullvadProxyClient, client::DaemonEvent};
 use mullvad_relay_selector::query::builder::RelayQueryBuilder;
 use mullvad_types::{
     constraints::Constraint, relay_constraints::GeographicLocationConstraint,
@@ -10,7 +10,7 @@ use talpid_types::{net::TunnelEndpoint, tunnel::ErrorStateCause};
 use test_macro::test_function;
 use test_rpc::ServiceClient;
 
-use super::{helpers, Error, TestContext};
+use super::{Error, TestContext, helpers};
 
 /// Test that daita and daita_direct_only works by connecting
 /// - to a non-DAITA relay with singlehop (should block)
@@ -181,8 +181,9 @@ pub async fn test_daita(
 }
 
 async fn wait_for_daemon_reconnect(
-    mut event_stream: impl futures::Stream<Item = Result<DaemonEvent, mullvad_management_interface::Error>>
-        + Unpin,
+    mut event_stream: impl futures::Stream<
+        Item = Result<DaemonEvent, mullvad_management_interface::Error>,
+    > + Unpin,
 ) -> Result<TunnelState, Error> {
     // wait until the daemon informs us that it's trying to connect
     helpers::find_daemon_event(&mut event_stream, |event| match event {
diff --git a/test/test-manager/src/tests/dns.rs b/test/test-manager/src/tests/dns.rs
index b54be0e02e..ff99cb4260 100644
--- a/test/test-manager/src/tests/dns.rs
+++ b/test/test-manager/src/tests/dns.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use std::{
     net::{IpAddr, Ipv4Addr, SocketAddr},
     sync::atomic::{AtomicUsize, Ordering},
@@ -8,28 +8,27 @@ use std::{
 use itertools::Itertools;
 use mullvad_management_interface::MullvadProxyClient;
 use mullvad_types::{
-    settings,
+    ConnectionConfig, CustomTunnelEndpoint, settings,
     wireguard::{DaitaSettings, QuantumResistantState},
-    ConnectionConfig, CustomTunnelEndpoint,
 };
 use talpid_types::net::wireguard;
 use test_macro::test_function;
 use test_rpc::ServiceClient;
 
 use super::{
-    helpers::{self, connect_and_wait, set_custom_endpoint},
     Error, TestContext,
+    helpers::{self, connect_and_wait, set_custom_endpoint},
 };
 use crate::{
+    TEST_CONFIG,
     network_monitor::{
-        start_packet_monitor_until, start_tunnel_packet_monitor_until, Direction,
-        IpHeaderProtocols, MonitorOptions,
+        Direction, IpHeaderProtocols, MonitorOptions, start_packet_monitor_until,
+        start_tunnel_packet_monitor_until,
     },
     vm::network::{
         CUSTOM_TUN_GATEWAY, CUSTOM_TUN_LOCAL_PRIVKEY, CUSTOM_TUN_LOCAL_TUN_ADDR,
         CUSTOM_TUN_REMOTE_PUBKEY, CUSTOM_TUN_REMOTE_REAL_PORT, CUSTOM_TUN_REMOTE_TUN_ADDR,
     },
-    TEST_CONFIG,
 };
 
 /// How long to wait for expected "DNS queries" to appear
diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs
index aef29578d0..16fe4e1e13 100644
--- a/test/test-manager/src/tests/helpers.rs
+++ b/test/test-manager/src/tests/helpers.rs
@@ -1,20 +1,20 @@
-use super::{config::TEST_CONFIG, Error, TestContext, WAIT_FOR_TUNNEL_STATE_TIMEOUT};
+use super::{Error, TestContext, WAIT_FOR_TUNNEL_STATE_TIMEOUT, config::TEST_CONFIG};
 use crate::{
     mullvad_daemon::RpcClientProvider,
     network_monitor::{
-        self, start_packet_monitor, MonitorOptions, MonitorUnexpectedlyStopped, PacketMonitor,
+        self, MonitorOptions, MonitorUnexpectedlyStopped, PacketMonitor, start_packet_monitor,
     },
     tests::{
         account::{clear_devices, new_device_client},
         helpers,
     },
 };
-use anyhow::{anyhow, bail, ensure, Context};
+use anyhow::{Context, anyhow, bail, ensure};
 use futures::StreamExt;
-use mullvad_management_interface::{client::DaemonEvent, MullvadProxyClient};
+use mullvad_management_interface::{MullvadProxyClient, client::DaemonEvent};
 use mullvad_relay_selector::{
-    query::{OpenVpnRelayQuery, RelayQuery, WireguardRelayQuery},
     GetRelay, RelaySelector, SelectorConfig, WireguardConfig,
+    query::{OpenVpnRelayQuery, RelayQuery, WireguardRelayQuery},
 };
 use mullvad_types::{
     constraints::Constraint,
@@ -35,7 +35,7 @@ use std::{
 };
 use talpid_types::net::wireguard::{PeerConfig, PrivateKey, TunnelConfig};
 use test_rpc::{
-    meta::Os, mullvad_daemon::ServiceStatus, package::Package, AmIMullvad, ServiceClient, SpawnOpts,
+    AmIMullvad, ServiceClient, SpawnOpts, meta::Os, mullvad_daemon::ServiceStatus, package::Package,
 };
 use tokio::time::sleep;
 
@@ -504,7 +504,7 @@ pub async fn wait_for_tunnel_state(
 
 pub async fn find_next_tunnel_state(
     stream: impl futures::Stream<Item = Result<DaemonEvent, mullvad_management_interface::Error>>
-        + Unpin,
+    + Unpin,
     accept_state_fn: impl Fn(&mullvad_types::states::TunnelState) -> bool,
 ) -> Result<mullvad_types::states::TunnelState, Error> {
     tokio::time::timeout(
@@ -519,8 +519,9 @@ pub async fn find_next_tunnel_state(
 }
 
 pub async fn find_daemon_event<Accept, AcceptedEvent>(
-    mut event_stream: impl futures::Stream<Item = Result<DaemonEvent, mullvad_management_interface::Error>>
-        + Unpin,
+    mut event_stream: impl futures::Stream<
+        Item = Result<DaemonEvent, mullvad_management_interface::Error>,
+    > + Unpin,
     accept_event: Accept,
 ) -> Result<AcceptedEvent, Error>
 where
diff --git a/test/test-manager/src/tests/install.rs b/test/test-manager/src/tests/install.rs
index 4c0195f3a5..a789a87f81 100644
--- a/test/test-manager/src/tests/install.rs
+++ b/test/test-manager/src/tests/install.rs
@@ -1,20 +1,20 @@
-use anyhow::{bail, ensure, Context};
+use anyhow::{Context, bail, ensure};
 use std::str::FromStr;
 use std::time::Duration;
 
 use mullvad_management_interface::MullvadProxyClient;
 use mullvad_types::{constraints::Constraint, relay_constraints};
 use test_macro::test_function;
-use test_rpc::{mullvad_daemon::ServiceStatus, ServiceClient};
+use test_rpc::{ServiceClient, mullvad_daemon::ServiceStatus};
 
 use crate::tests::helpers;
 
 use super::{
+    Error, TestContext,
     config::TEST_CONFIG,
     helpers::{
-        connect_and_wait, get_app_env, get_package_desc, install_app, wait_for_tunnel_state, Pinger,
+        Pinger, connect_and_wait, get_app_env, get_package_desc, install_app, wait_for_tunnel_state,
     },
-    Error, TestContext,
 };
 
 /// Upgrade to the "version under test". This test fails if:
diff --git a/test/test-manager/src/tests/macos.rs b/test/test-manager/src/tests/macos.rs
index 362a9b3c61..140f77bb10 100644
--- a/test/test-manager/src/tests/macos.rs
+++ b/test/test-manager/src/tests/macos.rs
@@ -1,6 +1,6 @@
 //! macOS-specific tests.
 
-use anyhow::{bail, ensure, Context};
+use anyhow::{Context, bail, ensure};
 use mullvad_management_interface::MullvadProxyClient;
 use std::net::{Ipv4Addr, SocketAddr};
 use test_macro::test_function;
diff --git a/test/test-manager/src/tests/mod.rs b/test/test-manager/src/tests/mod.rs
index fcf02ac0f6..39f4f12e90 100644
--- a/test/test-manager/src/tests/mod.rs
+++ b/test/test-manager/src/tests/mod.rs
@@ -29,7 +29,7 @@ use config::TEST_CONFIG;
 use helpers::{find_custom_list, get_app_env, install_app, set_location};
 pub use install::test_upgrade_app;
 use mullvad_management_interface::MullvadProxyClient;
-use test_rpc::{meta::Os, ServiceClient};
+use test_rpc::{ServiceClient, meta::Os};
 
 const WAIT_FOR_TUNNEL_STATE_TIMEOUT: Duration = Duration::from_secs(40);
 
diff --git a/test/test-manager/src/tests/relay_ip_overrides.rs b/test/test-manager/src/tests/relay_ip_overrides.rs
index a38be6f905..b3d29a5bd3 100644
--- a/test/test-manager/src/tests/relay_ip_overrides.rs
+++ b/test/test-manager/src/tests/relay_ip_overrides.rs
@@ -1,14 +1,14 @@
 #![cfg(target_os = "linux")]
 
 use super::{
-    helpers::{self, AbortOnDrop},
     TestContext,
+    helpers::{self, AbortOnDrop},
 };
 use crate::{
     tests::config::TEST_CONFIG,
     vm::{self, network::linux::TEST_SUBNET},
 };
-use anyhow::{anyhow, bail, ensure, Context};
+use anyhow::{Context, anyhow, bail, ensure};
 use futures::FutureExt;
 use mullvad_management_interface::MullvadProxyClient;
 use mullvad_relay_selector::query::builder::RelayQueryBuilder;
diff --git a/test/test-manager/src/tests/settings.rs b/test/test-manager/src/tests/settings.rs
index bd52800499..bc7ad3287d 100644
--- a/test/test-manager/src/tests/settings.rs
+++ b/test/test-manager/src/tests/settings.rs
@@ -1,7 +1,6 @@
 use super::{
-    helpers,
+    Error, TestContext, helpers,
     helpers::{connect_and_wait, send_guest_probes},
-    Error, TestContext,
 };
 
 use mullvad_management_interface::MullvadProxyClient;
diff --git a/test/test-manager/src/tests/software.rs b/test/test-manager/src/tests/software.rs
index 45b1c73ae1..e3619555aa 100644
--- a/test/test-manager/src/tests/software.rs
+++ b/test/test-manager/src/tests/software.rs
@@ -1,6 +1,6 @@
 //! Tests of interoperability with other software
 
-use super::{helpers, Error, TestContext};
+use super::{Error, TestContext, helpers};
 use mullvad_management_interface::MullvadProxyClient;
 use test_macro::test_function;
 use test_rpc::{ExecResult, ServiceClient};
diff --git a/test/test-manager/src/tests/split_tunnel.rs b/test/test-manager/src/tests/split_tunnel.rs
index 98cbed7951..74d43c9d8c 100644
--- a/test/test-manager/src/tests/split_tunnel.rs
+++ b/test/test-manager/src/tests/split_tunnel.rs
@@ -2,11 +2,12 @@ use anyhow::Context;
 use mullvad_management_interface::MullvadProxyClient;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use test_macro::test_function;
-use test_rpc::{meta::OsVersion, ServiceClient};
+use test_rpc::{ServiceClient, meta::OsVersion};
 
 use super::{
+    TestContext,
     helpers::{self, ConnChecker},
-    ui, TestContext,
+    ui,
 };
 
 const LEAK_DESTINATION: SocketAddr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(1, 1, 1, 1)), 1337);
diff --git a/test/test-manager/src/tests/tunnel.rs b/test/test-manager/src/tests/tunnel.rs
index 9f9b16b7b6..ecae2604c3 100644
--- a/test/test-manager/src/tests/tunnel.rs
+++ b/test/test-manager/src/tests/tunnel.rs
@@ -1,10 +1,10 @@
 use super::{
+    Error, TestContext,
     config::TEST_CONFIG,
     helpers::{self, apply_settings_from_relay_query, connect_and_wait, disconnect_and_wait},
-    Error, TestContext,
 };
 use crate::{
-    network_monitor::{start_packet_monitor, MonitorOptions},
+    network_monitor::{MonitorOptions, start_packet_monitor},
     tests::helpers::{login_with_retries, update_relay_constraints},
 };
 
@@ -20,11 +20,11 @@ use mullvad_types::{
 };
 use std::net::SocketAddr;
 use talpid_types::net::{
-    proxy::{CustomProxy, Socks5Local, Socks5Remote},
     TransportProtocol, TunnelType,
+    proxy::{CustomProxy, Socks5Local, Socks5Remote},
 };
 use test_macro::test_function;
-use test_rpc::{meta::Os, mullvad_daemon::ServiceStatus, ServiceClient};
+use test_rpc::{ServiceClient, meta::Os, mullvad_daemon::ServiceStatus};
 
 use pnet_packet::ip::IpNextHeaderProtocols;
 
diff --git a/test/test-manager/src/tests/tunnel_state.rs b/test/test-manager/src/tests/tunnel_state.rs
index 9b83e65ff8..4a02ede39d 100644
--- a/test/test-manager/src/tests/tunnel_state.rs
+++ b/test/test-manager/src/tests/tunnel_state.rs
@@ -1,9 +1,10 @@
 use super::{
+    Error, TestContext,
     helpers::{
         self, connect_and_wait, send_guest_probes, unreachable_wireguard_tunnel,
         wait_for_tunnel_state,
     },
-    ui, Error, TestContext,
+    ui,
 };
 use crate::{
     assert_tunnel_state,
@@ -13,10 +14,10 @@ use crate::{
 use mullvad_management_interface::MullvadProxyClient;
 use mullvad_relay_selector::query::builder::RelayQueryBuilder;
 use mullvad_types::{
+    CustomTunnelEndpoint,
     constraints::Constraint,
     relay_constraints::{GeographicLocationConstraint, LocationConstraint},
     states::TunnelState,
-    CustomTunnelEndpoint,
 };
 use std::{net::SocketAddr, time::Duration};
 use talpid_types::net::{Endpoint, TransportProtocol, TunnelEndpoint, TunnelType};
diff --git a/test/test-manager/src/tests/ui.rs b/test/test-manager/src/tests/ui.rs
index 889eabd850..1260bfeadc 100644
--- a/test/test-manager/src/tests/ui.rs
+++ b/test/test-manager/src/tests/ui.rs
@@ -1,4 +1,4 @@
-use super::{config::TEST_CONFIG, helpers, Error, TestContext};
+use super::{Error, TestContext, config::TEST_CONFIG, helpers};
 use mullvad_management_interface::MullvadProxyClient;
 use mullvad_relay_selector::query::builder::RelayQueryBuilder;
 use mullvad_types::relay_constraints::RelaySettings;
@@ -8,7 +8,7 @@ use std::{
     path::{Path, PathBuf},
 };
 use test_macro::test_function;
-use test_rpc::{meta::Os, ExecResult, ServiceClient};
+use test_rpc::{ExecResult, ServiceClient, meta::Os};
 
 pub async fn run_test<T: AsRef<str> + Debug>(
     rpc: &ServiceClient,