fix: clippy errors

Sequal32 · May 9, 2023 · f04a8a1 · f04a8a1
1 parent 07e3c9e
commit f04a8a1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/src/yourcontrols-hoster/src/hoster/state.rs b/src/yourcontrols-hoster/src/hoster/state.rs
@@ -30,12 +30,10 @@ impl ServerState {
     }
 
     pub fn get_from_addr(&mut self, addr: SocketAddr) -> Option<&mut ClientConnection> {
-        for (_, client) in self.clients.iter_mut() {
-            if client.addr == addr {
-                return Some(client);
-            }
-        }
-        None
+        self.clients
+            .iter_mut()
+            .map(|(_, client)| client)
+            .find(|client| client.addr == addr)
     }
 
     pub fn add_client(&mut self, name: String, addr: SocketAddr, is_observer: bool) {

diff --git a/src/yourcontrols/src/clientmanager.rs b/src/yourcontrols/src/clientmanager.rs
@@ -61,7 +61,7 @@ impl ClientManager {
 
         if let Some(next_control) = self.next_control.as_ref() {
             if next_control == name {
-                self.next_control = self.clients.keys().into_iter().next().cloned();
+                self.next_control = self.clients.keys().next().cloned();
             }
         }
     }
@@ -100,8 +100,4 @@ impl ClientManager {
         self.clients.clear();
         self.current_control = None;
     }
-
-    pub fn get_number_clients(&self) -> usize {
-        self.clients.len()
-    }
 }
diff --git a/src/yourcontrols/src/main.rs b/src/yourcontrols/src/main.rs
@@ -1,5 +1,4 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-#![allow(unaligned_references)]
 
 mod app;
 mod clientmanager;
@@ -46,7 +45,7 @@ const LOOP_SLEEP_TIME: Duration = Duration::from_millis(10);
 fn get_aircraft_configs() -> io::Result<Vec<String>> {
     let mut filenames = Vec::new();
 
-    for file in read_dir(&AIRCRAFT_DEFINITIONS_PATH)? {
+    for file in read_dir(AIRCRAFT_DEFINITIONS_PATH)? {
         let file = file?;
         filenames.push(
             file.path()

diff --git a/src/yourcontrols/src/sync/gaugecommunicator.rs b/src/yourcontrols/src/sync/gaugecommunicator.rs
@@ -61,9 +61,9 @@ pub enum InterpolationType {
 
 fn format_get(var_name: &str, var_units: Option<&str>) -> String {
     if let Some(unit) = var_units {
-        return format!(r#"({}, {})"#, var_name, unit.trim());
+        format!(r#"({}, {})"#, var_name, unit.trim())
     } else {
-        return format!(r#"({})"#, var_name.trim());
+        format!(r#"({})"#, var_name.trim())
     }
 }