Run `cargo fmt` in test-repo

5 files changed, 11 insertions, 11 deletions

diff --git a/test/test-runner/src/forward.rs b/test/test-runner/src/forward.rs
index 01b48e647a..590e164940 100644
--- a/test/test-runner/src/forward.rs
+++ b/test/test-runner/src/forward.rs
@@ -2,8 +2,8 @@ use std::{
     collections::HashMap,
     net::SocketAddr,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc, LazyLock, Mutex,
+        atomic::{AtomicUsize, Ordering},
     },
 };
 use test_rpc::net::SockHandleId;
diff --git a/test/test-runner/src/logging.rs b/test/test-runner/src/logging.rs
index bab3693c34..55e6668604 100644
--- a/test/test-runner/src/logging.rs
+++ b/test/test-runner/src/logging.rs
@@ -9,8 +9,8 @@ use tokio::{
     fs::File,
     io::{self, AsyncBufReadExt, BufReader},
     sync::{
-        broadcast::{channel, Receiver, Sender},
         Mutex,
+        broadcast::{Receiver, Sender, channel},
     },
 };
 
diff --git a/test/test-runner/src/main.rs b/test/test-runner/src/main.rs
index a7e1a26515..95392dc93f 100644
--- a/test/test-runner/src/main.rs
+++ b/test/test-runner/src/main.rs
@@ -1,4 +1,4 @@
-use futures::{pin_mut, select, select_biased, FutureExt, SinkExt, StreamExt};
+use futures::{FutureExt, SinkExt, StreamExt, pin_mut, select, select_biased};
 use logging::LOGGER;
 use std::{
     collections::{BTreeMap, HashMap},
@@ -12,17 +12,17 @@ use util::OnDrop;
 
 use tarpc::{context, server::Channel};
 use test_rpc::{
+    AppTrace, Service, SpawnOpts, UNPRIVILEGED_USER,
     meta::OsVersion,
-    mullvad_daemon::{ServiceStatus, SOCKET_PATH},
+    mullvad_daemon::{SOCKET_PATH, ServiceStatus},
     net::SockHandleId,
     package::Package,
     transport::GrpcForwarder,
-    AppTrace, Service, SpawnOpts, UNPRIVILEGED_USER,
 };
 use tokio::{
     io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader},
     process::{ChildStdin, ChildStdout, Command},
-    sync::{broadcast::error::TryRecvError, oneshot, Mutex},
+    sync::{Mutex, broadcast::error::TryRecvError, oneshot},
     task,
     time::sleep,
 };
diff --git a/test/test-runner/src/net.rs b/test/test-runner/src/net.rs
index 7d32f04812..967d3c8c32 100644
--- a/test/test-runner/src/net.rs
+++ b/test/test-runner/src/net.rs
@@ -141,7 +141,7 @@ pub async fn send_ping(
     interface: Option<&str>,
     size: usize,
 ) -> Result<(), test_rpc::Error> {
-    use surge_ping::{Client, Config, PingIdentifier, PingSequence, ICMP};
+    use surge_ping::{Client, Config, ICMP, PingIdentifier, PingSequence};
 
     const IPV4_HEADER_SIZE: usize = 20;
     const ICMP_HEADER_SIZE: usize = 8;
diff --git a/test/test-runner/src/sys.rs b/test/test-runner/src/sys.rs
index 024e1153c9..a20a84cbaa 100644
--- a/test/test-runner/src/sys.rs
+++ b/test/test-runner/src/sys.rs
@@ -24,7 +24,7 @@ const MULLVAD_WIN_REGISTRY: &str = r"SYSTEM\CurrentControlSet\Services\Mullvad V
 pub fn reboot() -> Result<(), test_rpc::Error> {
     use windows_sys::Win32::{
         System::Shutdown::{
-            ExitWindowsEx, EWX_REBOOT, SHTDN_REASON_FLAG_PLANNED, SHTDN_REASON_MAJOR_APPLICATION,
+            EWX_REBOOT, ExitWindowsEx, SHTDN_REASON_FLAG_PLANNED, SHTDN_REASON_MAJOR_APPLICATION,
             SHTDN_REASON_MINOR_OTHER,
         },
         UI::WindowsAndMessaging::EWX_FORCEIFHUNG,
@@ -65,7 +65,7 @@ fn grant_shutdown_privilege() -> Result<(), test_rpc::Error> {
     use windows_sys::Win32::{
         Foundation::{CloseHandle, HANDLE, LUID},
         Security::{
-            AdjustTokenPrivileges, LookupPrivilegeValueW, LUID_AND_ATTRIBUTES,
+            AdjustTokenPrivileges, LUID_AND_ATTRIBUTES, LookupPrivilegeValueW,
             SE_PRIVILEGE_ENABLED, TOKEN_ADJUST_PRIVILEGES, TOKEN_PRIVILEGES,
         },
         System::{
@@ -501,7 +501,7 @@ pub async fn set_daemon_environment(env: HashMap<String, String>) -> Result<(),
             .map_err(|e| test_rpc::Error::Registry(e.to_string()))?;
     }
     // Persist the changed environment variables, such that we can retrieve them at will.
-    use winreg::{enums::*, RegKey};
+    use winreg::{RegKey, enums::*};
     let hklm = RegKey::predef(HKEY_LOCAL_MACHINE);
     let path = Path::new(MULLVAD_WIN_REGISTRY).join("Environment");
     let (registry, _) = hklm.create_subkey(&path).map_err(|error| {
@@ -636,7 +636,7 @@ fn parse_systemd_env_file(input: &str) -> impl Iterator<Item = EnvVar> + '_ {
 
 #[cfg(target_os = "windows")]
 pub async fn get_daemon_environment() -> Result<HashMap<String, String>, test_rpc::Error> {
-    use winreg::{enums::*, RegKey};
+    use winreg::{RegKey, enums::*};
 
     let env =
         tokio::task::spawn_blocking(|| -> Result<HashMap<String, String>, test_rpc::Error> {