chore: cargo clippy

Author: ZigTag

src/database/src/database.rs

@@ -33,6 +33,7 @@ use crate::{
     sql_structs, util,
 };
 
+#[derive(Default)]
 pub struct Database {
     database: Option<Connection>,
     pub path: Option<String>,
@@ -51,10 +52,7 @@ impl Error for NoDatabaseOpen {}
 
 impl Database {
     pub fn new() -> Self {
-        Database {
-            database: None,
-            path: None,
-        }
+        Default::default()
     }
 
     fn get_database(&self) -> Result<&Connection, NoDatabaseOpen> {

src/database/src/output/airspace.rs

@@ -62,7 +62,7 @@ impl Path {
                 arc: None,
                 path_type: match boundary_char {
                     'G' => PathType::GreatCircle,
-                    'H' | _ => PathType::RhumbLine,
+                    _ => PathType::RhumbLine,
                 },
             },
             'L' | 'R' => Self {
@@ -79,7 +79,7 @@ impl Path {
                     bearing: arc_bearing.unwrap(),
                     direction: match boundary_char {
                         'R' => TurnDirection::Right,
-                        'L' | _ => TurnDirection::Left,
+                        _ => TurnDirection::Left,
                     },
                 }),
                 path_type: PathType::Arc,
@@ -115,7 +115,7 @@ pub(crate) fn map_controlled_airspaces(
     let mut airspace_complete = false;
 
     data.into_iter().fold(Vec::new(), |mut airspaces, row| {
-        if airspaces.len() == 0 || airspace_complete {
+        if airspaces.is_empty() || airspace_complete {
             airspaces.push(ControlledAirspace {
                 area_code: row.area_code.clone(),
                 icao_code: row.icao_code.clone(),
@@ -124,7 +124,7 @@ pub(crate) fn map_controlled_airspaces(
                     .controlled_airspace_name
                     .clone()
                     .expect("First row of an airspace data must have a name"),
-                airspace_type: row.airspace_type.clone(),
+                airspace_type: row.airspace_type,
                 boundary_paths: Vec::new(),
             });
 
@@ -157,7 +157,7 @@ pub(crate) fn map_restrictive_airspaces(
     let mut airspace_complete = false;
 
     data.into_iter().fold(Vec::new(), |mut airspaces, row| {
-        if airspaces.len() == 0 || airspace_complete {
+        if airspaces.is_empty() || airspace_complete {
             airspaces.push(RestrictiveAirspace {
                 area_code: row.area_code.clone(),
                 icao_code: row.icao_code.clone(),
@@ -166,7 +166,7 @@ pub(crate) fn map_restrictive_airspaces(
                     .restrictive_airspace_name
                     .clone()
                     .expect("First row of an airspace data must have a name"),
-                airspace_type: row.restrictive_type.clone(),
+                airspace_type: row.restrictive_type,
                 boundary_paths: Vec::new(),
             });
 

src/database/src/output/procedure/mod.rs

@@ -26,7 +26,7 @@ fn mut_find_or_insert<T, P: FnMut(&T) -> bool>(vec: &mut Vec<T>, condition: P, v
 }
 
 /// Applies the neccesary logic for adding a leg with an enroute transition route type into a procedure
-pub(self) fn apply_enroute_transition_leg(
+fn apply_enroute_transition_leg(
     leg: ProcedureLeg,
     transition_identifier: String,
     enroute_transitions: &mut Vec<Transition>,
@@ -44,12 +44,12 @@ pub(self) fn apply_enroute_transition_leg(
 }
 
 /// Applies the neccesary logic for adding a leg with a common leg route type into a procedure
-pub(self) fn apply_common_leg(
+fn apply_common_leg(
     leg: ProcedureLeg,
     transition_identifier: Option<String>,
     runway_transitions: &mut Vec<Transition>,
     common_legs: &mut Vec<ProcedureLeg>,
-    runways: &Vec<Runways>,
+    runways: &[Runways],
 ) {
     // Common legs can still have a transition identifier, meaning that this procedure is only for
     // specific runways, but with the same legs for each runway.
@@ -113,11 +113,11 @@ pub(self) fn apply_common_leg(
 }
 
 /// Applies the neccesary logic for adding a leg with a runway transition route type into a procedure
-pub(self) fn apply_runway_transition_leg(
+fn apply_runway_transition_leg(
     leg: ProcedureLeg,
     transition_identifier: String,
     runway_transitions: &mut Vec<Transition>,
-    runways: &Vec<Runways>,
+    runways: &[Runways],
 ) {
     // If transition identifier ends in B, it means this transition serves all runways with the same
     // number. To make this easier to use in an FMS, we duplicate the transitions for all runways which

src/database/src/util.rs

@@ -17,17 +17,14 @@ pub enum PathType {
 /// We aren't able to get file metadata in the sim so we can't use some of the standard library file system functions
 /// (like is_dir, exists, and some others)
 pub fn get_path_type(path: &Path) -> PathType {
-    match fs::read_dir(path) {
-        Ok(mut dir_res) => {
-            let next = dir_res.next();
-
-            if let Some(result) = next {
-                if result.is_ok() {
-                    return PathType::Directory;
-                }
+    if let Ok(mut dir_res) = fs::read_dir(path) {
+        let next = dir_res.next();
+
+        if let Some(result) = next {
+            if result.is_ok() {
+                return PathType::Directory;
             }
         }
-        Err(_) => {}
     };
 
     let file_res = fs::File::open(path);
@@ -39,7 +36,7 @@ pub fn get_path_type(path: &Path) -> PathType {
 }
 
 pub fn find_sqlite_file(path: &str) -> Result<String, Box<dyn Error>> {
-    if get_path_type(&Path::new(path)) != PathType::Directory {
+    if get_path_type(Path::new(path)) != PathType::Directory {
         return Err("Path is not a directory".into());
     }
 
@@ -50,7 +47,7 @@ pub fn find_sqlite_file(path: &str) -> Result<String, Box<dyn Error>> {
         if get_path_type(&path) == PathType::File {
             let path = path.to_str().ok_or("Invalid path")?;
 
-            let extension = path.split(".").last();
+            let extension = path.split('.').last();
 
             if extension == Some("s3db") {
                 return Ok(path.to_string());
@@ -61,7 +58,7 @@ pub fn find_sqlite_file(path: &str) -> Result<String, Box<dyn Error>> {
 }
 
 pub fn is_sqlite_file(path: &str) -> Result<bool, Box<dyn Error>> {
-    if get_path_type(&Path::new(path)) != PathType::File {
+    if get_path_type(Path::new(path)) != PathType::File {
         return Ok(false);
     }
 
@@ -90,9 +87,9 @@ pub fn fetch_rows<T>(
 where
     T: for<'r> serde::Deserialize<'r>,
 {
-    let mut rows = stmt.query_and_then(params, |r| serde_rusqlite::from_row::<T>(r))?;
+    let rows = stmt.query_and_then(params, |r| serde_rusqlite::from_row::<T>(r))?;
     let mut data = Vec::new();
-    while let Some(row) = rows.next() {
+    for row in rows {
         data.push(row.map_err(|e| e.to_string())?);
     }
     Ok(data)

src/wasm/build.rs

@@ -2,7 +2,7 @@ use std::process::Command;
 
 fn main() {
     let output = Command::new("git")
-        .args(&["rev-parse", "HEAD"])
+        .args(["rev-parse", "HEAD"])
         .output()
         .expect("Git is required to build");
     let git_hash = String::from_utf8(output.stdout).unwrap();

src/wasm/src/dispatcher.rs

@@ -141,7 +141,8 @@ impl<'a> Dispatcher<'a> {
         };
 
         // Determine if we are bundled ONLY and the bundled cycle is newer than the installed (old bundled) cycle
-        let bundled_updated = if is_bundled.is_some() && is_bundled.unwrap() {
+        let bundled_updated = if is_bundled.is_some_and(|x| x) {
+            // Clippy yells but this isn't good to switch until if-let chaining is implemented (Rust 2024)
             if installed_cycle.is_some() && bundled_cycle.is_some() {
                 bundled_cycle.unwrap() > installed_cycle.unwrap()
             } else {
@@ -157,8 +158,8 @@ impl<'a> Dispatcher<'a> {
         // If we are bundled and the installed cycle is older than the bundled cycle, we need to copy the bundled database to the work location. Or if we haven't installed anything yet, we need to copy the bundled database to the work location
         if bundled_updated || need_to_copy {
             match util::copy_files_to_folder(
-                &Path::new(consts::NAVIGATION_DATA_DEFAULT_LOCATION),
-                &Path::new(consts::NAVIGATION_DATA_WORK_LOCATION),
+                Path::new(consts::NAVIGATION_DATA_DEFAULT_LOCATION),
+                Path::new(consts::NAVIGATION_DATA_WORK_LOCATION),
             ) {
                 Ok(_) => {
                     // Set the internal state to bundled
@@ -178,7 +179,7 @@ impl<'a> Dispatcher<'a> {
         }
 
         // Finally, set the active database
-        if path_exists(&Path::new(consts::NAVIGATION_DATA_WORK_LOCATION)) {
+        if path_exists(Path::new(consts::NAVIGATION_DATA_WORK_LOCATION)) {
             match self
                 .database
                 .set_active_database(consts::NAVIGATION_DATA_WORK_LOCATION.to_owned())
@@ -196,16 +197,13 @@ impl<'a> Dispatcher<'a> {
     }
 
     fn on_download_finish(&mut self) {
-        match navigation_database::util::find_sqlite_file(consts::NAVIGATION_DATA_WORK_LOCATION) {
-            Ok(path) => {
-                match self.database.set_active_database(path) {
-                    Ok(_) => {}
-                    Err(e) => {
-                        println!("[NAVIGRAPH] Failed to set active database: {}", e);
-                    }
-                };
-            }
-            Err(_) => {}
+        if let Ok(path) = navigation_database::util::find_sqlite_file(consts::NAVIGATION_DATA_WORK_LOCATION) {
+            match self.database.set_active_database(path) {
+                Ok(_) => {}
+                Err(e) => {
+                    println!("[NAVIGRAPH] Failed to set active database: {}", e);
+                }
+            };
         }
     }
 

src/wasm/src/download/zip_handler.rs

@@ -73,7 +73,7 @@ impl<R: io::Read + io::Seek> ZipFileHandler<R> {
             if self.current_file_index >= self.zip_file_count {
                 let fix_file = &self.path_buf.join("foo.txt");
 
-                if !util::path_exists(&fix_file) {
+                if !util::path_exists(fix_file) {
                     fs::File::create(fix_file)?;
                 }
 

src/wasm/src/meta.rs

@@ -14,17 +14,11 @@ use crate::{
     util::path_exists,
 };
 
-#[derive(serde::Serialize, serde::Deserialize, Debug)]
+#[derive(serde::Serialize, serde::Deserialize, Debug, Default)]
 pub struct InternalState {
     pub is_bundled: bool,
 }
 
-impl Default for InternalState {
-    fn default() -> Self {
-        Self { is_bundled: false }
-    }
-}
-
 #[derive(serde::Serialize, Clone, Copy, Debug, PartialEq, Eq)]
 pub enum InstallStatus {
     Bundled,
@@ -71,8 +65,8 @@ pub struct InstalledNavigationDataCycleInfo {
 
 pub fn get_internal_state() -> Result<InternalState, Box<dyn Error>> {
     let config_path = Path::new(consts::NAVIGATION_DATA_INTERNAL_CONFIG_LOCATION);
-    if !path_exists(&config_path) {
-        return Err("Internal config file does not exist")?;
+    if !path_exists(config_path) {
+        Err("Internal config file does not exist")?;
     }
 
     let config_file = std::fs::File::open(config_path)?;
@@ -196,31 +190,19 @@ pub fn get_navigation_data_install_status(task: Rc<RefCell<Task>>) {
 
     let navigation_data_status = NavigationDataStatus {
         status,
-        installed_format: match &installed_cycle_info {
-            Some(installed_cycle_info) => Some(installed_cycle_info.format.clone()),
-            None => None,
-        },
-        installed_revision: match &installed_cycle_info {
-            Some(installed_cycle_info) => Some(installed_cycle_info.revision.clone()),
-            None => None,
-        },
-        installed_cycle: match &installed_cycle_info {
-            Some(installed_cycle_info) => Some(installed_cycle_info.cycle.clone()),
-            None => None,
-        },
+        installed_format: installed_cycle_info.as_ref().map(|installed_cycle_info| installed_cycle_info.format.clone()),
+        installed_revision: installed_cycle_info.as_ref().map(|installed_cycle_info| installed_cycle_info.revision.clone()),
+        installed_cycle: installed_cycle_info.as_ref().map(|installed_cycle_info| installed_cycle_info.cycle.clone()),
         install_path: if status == InstallStatus::Manual {
             Some(consts::NAVIGATION_DATA_WORK_LOCATION.to_string())
         } else {
             None
         },
-        validity_period: match &installed_cycle_info {
-            Some(installed_cycle_info) => Some(installed_cycle_info.validity_period.clone()),
-            None => None,
-        },
+        validity_period: installed_cycle_info.as_ref().map(|installed_cycle_info| installed_cycle_info.validity_period.clone()),
         latest_cycle: response_struct.cycle,
     };
 
-    let status_as_value = match serde_json::to_value(&navigation_data_status) {
+    let status_as_value = match serde_json::to_value(navigation_data_status) {
         Ok(status_as_value) => status_as_value,
         Err(e) => {
             task.borrow_mut().status = TaskStatus::Failure(e.to_string());