Fix Rust warnings/formatting complaints

1 files changed, 18 insertions, 7 deletions

diff --git a/mullvad-ios/src/api_client/mod.rs b/mullvad-ios/src/api_client/mod.rs
index 83348f463b..3038260e94 100644
--- a/mullvad-ios/src/api_client/mod.rs
+++ b/mullvad-ios/src/api_client/mod.rs
@@ -1,10 +1,13 @@
-use std::{ffi::c_char, ffi::c_void, ffi::CStr, future::Future, sync::Arc};
+use std::{ffi::c_char, ffi::c_void, future::Future, sync::Arc};
 
 use crate::get_string;
 use access_method_resolver::SwiftAccessMethodResolver;
 use access_method_settings::SwiftAccessMethodSettingsWrapper;
 use address_cache_provider::SwiftAddressCacheWrapper;
-use futures::{channel::{mpsc, oneshot}, StreamExt};
+use futures::{
+    StreamExt,
+    channel::{mpsc, oneshot},
+};
 use mullvad_api::{
     ApiEndpoint, Runtime,
     access_mode::{AccessMethodEvent, AccessModeSelector, AccessModeSelectorHandle},
@@ -146,7 +149,7 @@ pub extern "C" fn mullvad_api_init_new_tls_disabled(
     bridge_provider: SwiftShadowsocksLoaderWrapper,
     settings_provider: SwiftAccessMethodSettingsWrapper,
     address_cache: SwiftAddressCacheWrapper,
-    access_method_change_callback: Option<unsafe extern "C" fn(*const c_void, * const u8)>,
+    access_method_change_callback: Option<unsafe extern "C" fn(*const c_void, *const u8)>,
     access_method_change_context: *const c_void, 
 ) -> SwiftApiContext {
     mullvad_api_init_inner(
@@ -182,7 +185,7 @@ pub extern "C" fn mullvad_api_init_new(
     bridge_provider: SwiftShadowsocksLoaderWrapper,
     settings_provider: SwiftAccessMethodSettingsWrapper,
     address_cache: SwiftAddressCacheWrapper,
-    access_method_change_callback: Option<unsafe extern "C" fn(*const c_void, * const u8)>,
+    access_method_change_callback: Option<unsafe extern "C" fn(*const c_void, *const u8)>,
     access_method_change_context: *const c_void, 
 ) -> SwiftApiContext {
     #[cfg(feature = "api-override")]
@@ -231,7 +234,7 @@ pub extern "C" fn mullvad_api_init_inner(
     bridge_provider: SwiftShadowsocksLoaderWrapper,
     settings_provider: SwiftAccessMethodSettingsWrapper,
     address_cache: SwiftAddressCacheWrapper,
-    access_method_change_callback: Option<unsafe extern "C" fn(*const c_void, * const u8)>,
+    access_method_change_callback: Option<unsafe extern "C" fn(*const c_void, *const u8)>,
     access_method_change_context: *const c_void, 
 ) -> SwiftApiContext {
     // Safety: See notes for `get_string`
@@ -265,7 +268,9 @@ pub extern "C" fn mullvad_api_init_inner(
         address_cache,
     );
 
-    let access_method_change_ctx: ForeignPtr = ForeignPtr { ptr: access_method_change_context };
+    let access_method_change_ctx: ForeignPtr = ForeignPtr {
+        ptr: access_method_change_context
+    };
     let api_context = tokio_handle.clone().block_on(async move {
         let (tx, mut rx) = mpsc::unbounded::<(AccessMethodEvent, oneshot::Sender<()>)>();
         let (access_mode_handler, access_mode_provider) = AccessModeSelector::spawn(
@@ -283,7 +288,13 @@ pub extern "C" fn mullvad_api_init_inner(
             // SAFETY: The callback is expected to be called from the Swift side
             if let Some(callback) = access_method_change_callback {
                 while let Some((event, _sender)) = rx.next().await {
-                    let AccessMethodEvent::New { setting, connection_mode, endpoint } = event else { continue };
+                    let AccessMethodEvent::New {
+                        setting,
+                        connection_mode: _,
+                        endpoint: _ 
+                    } = event else {
+                        continue
+                    };
                     let uuid = setting.get_id();
                     let uuid_bytes = uuid.as_bytes();
                     // SAFETY: The callback is expected to be safe to call