run cargo fmt

Author: ethangreen-dev

src/cli.rs

@@ -76,7 +76,7 @@ pub enum ExternSubcommand {
         /// Use the `list` command to query the list of imported and supported games.
         #[clap(long)]
         game_id: String,
-    }
+    },
 }
 
 #[derive(Subcommand, Debug)]

src/error.rs

@@ -1,11 +1,10 @@
 use std::path::{Path, PathBuf};
 
-use crate::server::ServerError;
-use crate::ts::error::ApiError;
-
 use crate::game::error::GameError;
 use crate::package::error::PackageError;
 use crate::project::error::ProjectError;
+use crate::server::ServerError;
+use crate::ts::error::ApiError;
 
 #[derive(Debug, thiserror::Error)]
 #[repr(u32)]
@@ -82,7 +81,10 @@ impl From<std::io::Error> for Error {
 
 impl From<reqwest::Error> for Error {
     fn from(value: reqwest::Error) -> Self {
-        Self::Api(ApiError::BadRequest { source: value, response_body: None })
+        Self::Api(ApiError::BadRequest {
+            source: value,
+            response_body: None,
+        })
     }
 }
 

src/game/error.rs

@@ -13,7 +13,10 @@ pub enum GameError {
     NotFound(String, String),
 
     #[error("Could not find any of '{possible_names:?}' in base directory: '{base_path}'.")]
-    ExeNotFound { possible_names: Vec<String>, base_path: PathBuf},
+    ExeNotFound {
+        possible_names: Vec<String>,
+        base_path: PathBuf,
+    },
 
     #[error("The Steam library could not be automatically found.")]
     SteamDirNotFound,

src/game/import/ea.rs

@@ -35,11 +35,10 @@ impl GameImporter for EaImporter {
             .custom_exe
             .clone()
             .or_else(|| super::find_game_exe(&r2mm.exe_names, &game_dir))
-            .ok_or_else(|| {
-                GameError::ExeNotFound {
-                    possible_names: r2mm.exe_names.clone(),
-                    base_path: game_dir.clone(),
-            }})?;
+            .ok_or_else(|| GameError::ExeNotFound {
+                possible_names: r2mm.exe_names.clone(),
+                base_path: game_dir.clone(),
+            })?;
         let dist = ActiveDistribution {
             dist: GameDefPlatform::Origin {
                 identifier: self.ident.to_string(),

src/game/import/egs.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 use serde::{Deserialize, Serialize};
 
 use super::{GameImporter, ImportBase};
-use crate::error::{IoError, Error};
+use crate::error::{Error, IoError};
 use crate::game::error::GameError;
 use crate::game::registry::{ActiveDistribution, GameData};
 use crate::ts::v1::models::ecosystem::GameDefPlatform;
@@ -81,11 +81,10 @@ impl GameImporter for EgsImporter {
             .custom_exe
             .clone()
             .or_else(|| super::find_game_exe(&r2mm.exe_names, &game_dir))
-            .ok_or_else(|| {
-                GameError::ExeNotFound {
-                    possible_names: r2mm.exe_names.clone(),
-                    base_path: game_dir.clone(),
-            }})?;
+            .ok_or_else(|| GameError::ExeNotFound {
+                possible_names: r2mm.exe_names.clone(),
+                base_path: game_dir.clone(),
+            })?;
         let dist = ActiveDistribution {
             dist: GameDefPlatform::Other,
             game_dir: game_dir.to_path_buf(),

src/game/import/gamepass.rs

@@ -49,11 +49,10 @@ impl GameImporter for GamepassImporter {
             .custom_exe
             .clone()
             .or_else(|| super::find_game_exe(&r2mm.exe_names, &game_dir))
-            .ok_or_else(|| {
-                GameError::ExeNotFound {
-                    possible_names: r2mm.exe_names.clone(),
-                    base_path: game_dir.clone(),
-            }})?;
+            .ok_or_else(|| GameError::ExeNotFound {
+                possible_names: r2mm.exe_names.clone(),
+                base_path: game_dir.clone(),
+            })?;
         let dist = ActiveDistribution {
             dist: GameDefPlatform::GamePass {
                 identifier: self.ident.to_string(),

src/game/import/mod.rs

@@ -14,7 +14,7 @@ use crate::game::import::ea::EaImporter;
 use crate::game::import::egs::EgsImporter;
 use crate::game::import::gamepass::GamepassImporter;
 use crate::game::import::steam::SteamImporter;
-use crate::ts::v1::models::ecosystem::{ GameDef, GameDefPlatform };
+use crate::ts::v1::models::ecosystem::{GameDef, GameDefPlatform};
 
 pub trait GameImporter {
     fn construct(self: Box<Self>, base: ImportBase) -> Result<GameData, Error>;

src/game/import/nodrm.rs

@@ -1,8 +1,8 @@
 use std::path::{Path, PathBuf};
 
+use super::{GameImporter, ImportBase};
 use crate::error::{Error, IoError};
 use crate::game::error::GameError;
-use super::{GameImporter, ImportBase};
 use crate::game::registry::{ActiveDistribution, GameData};
 use crate::ts::v1::models::ecosystem::GameDefPlatform;
 
@@ -33,8 +33,9 @@ impl GameImporter for NoDrmImporter {
             .custom_exe
             .clone()
             .or_else(|| super::find_game_exe(&r2mm.exe_names, &self.game_dir))
-            .ok_or_else(|| {
-                GameError::ExeNotFound { possible_names: r2mm.exe_names.clone(), base_path: self.game_dir.clone() }
+            .ok_or_else(|| GameError::ExeNotFound {
+                possible_names: r2mm.exe_names.clone(),
+                base_path: self.game_dir.clone(),
             })?;
         let dist = ActiveDistribution {
             dist: GameDefPlatform::Other,

src/game/import/steam.rs

@@ -40,9 +40,9 @@ impl GameImporter for SteamImporter {
                     .as_ref()
                     .map_or_else(SteamDir::locate, |x| SteamDir::from_dir(x))
                     .map_err(|e: steamlocate::Error| match e {
-                        steamlocate::Error::InvalidSteamDir(_) => {
-                            GameError::SteamDirBadPath(self.steam_dir.as_ref().unwrap().to_path_buf())
-                        }
+                        steamlocate::Error::InvalidSteamDir(_) => GameError::SteamDirBadPath(
+                            self.steam_dir.as_ref().unwrap().to_path_buf(),
+                        ),
                         steamlocate::Error::FailedLocate(_) => GameError::SteamDirNotFound,
                         _ => unreachable!(),
                     })?;
@@ -75,11 +75,10 @@ impl GameImporter for SteamImporter {
             .iter()
             .map(|x| app_dir.join(x))
             .find(|x| x.is_file())
-            .ok_or_else(|| {
-                GameError::ExeNotFound {
-                    possible_names: r2mm.exe_names.clone(),
-                    base_path: app_dir.clone(),
-            }})?;
+            .ok_or_else(|| GameError::ExeNotFound {
+                possible_names: r2mm.exe_names.clone(),
+                base_path: app_dir.clone(),
+            })?;
 
         let dist = ActiveDistribution {
             dist: GameDefPlatform::Steam {

src/game/mod.rs

@@ -1,5 +1,5 @@
 pub mod ecosystem;
+pub mod error;
 pub mod import;
 pub mod proc;
 pub mod registry;
-pub mod error;