formatting: format the world!

Author: da2ce7

src/api/server.rs

@@ -1,4 +1,3 @@
-use std;
 use std::collections::HashMap;
 use std::fs;
 use std::net::IpAddr;
@@ -8,7 +7,7 @@ use std::str::FromStr;
 use config::{Config, ConfigError, File};
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, NoneAsEmptyString};
-use toml;
+use {std, toml};
 
 use crate::databases::database::DatabaseDrivers;
 use crate::mode::TrackerMode;
@@ -70,24 +69,21 @@ impl std::fmt::Display for ConfigurationError {
         match self {
             ConfigurationError::IOError(e) => e.fmt(f),
             ConfigurationError::ParseError(e) => e.fmt(f),
-            _ => write!(f, "{:?}", self)
+            _ => write!(f, "{:?}", self),
         }
     }
 }
 
 impl std::error::Error for ConfigurationError {}
 
 impl Configuration {
-
     pub fn get_ext_ip(&self) -> Option<IpAddr> {
         match &self.external_ip {
             None => None,
-            Some(external_ip) => {
-                match IpAddr::from_str(external_ip) {
-                    Ok(external_ip) => Some(external_ip),
-                    Err(_) => None
-                }
-            }
+            Some(external_ip) => match IpAddr::from_str(external_ip) {
+                Ok(external_ip) => Some(external_ip),
+                Err(_) => None,
+            },
         }
     }
 
@@ -111,24 +107,23 @@ impl Configuration {
             http_api: HttpApiConfig {
                 enabled: true,
                 bind_address: String::from("127.0.0.1:1212"),
-                access_tokens: [(String::from("admin"), String::from("MyAccessToken"))].iter().cloned().collect(),
+                access_tokens: [(String::from("admin"), String::from("MyAccessToken"))]
+                    .iter()
+                    .cloned()
+                    .collect(),
             },
         };
-        configuration.udp_trackers.push(
-            UdpTrackerConfig {
-                enabled: false,
-                bind_address: String::from("0.0.0.0:6969"),
-            }
-        );
-        configuration.http_trackers.push(
-            HttpTrackerConfig {
-                enabled: false,
-                bind_address: String::from("0.0.0.0:6969"),
-                ssl_enabled: false,
-                ssl_cert_path: None,
-                ssl_key_path: None,
-            }
-        );
+        configuration.udp_trackers.push(UdpTrackerConfig {
+            enabled: false,
+            bind_address: String::from("0.0.0.0:6969"),
+        });
+        configuration.http_trackers.push(HttpTrackerConfig {
+            enabled: false,
+            bind_address: String::from("0.0.0.0:6969"),
+            ssl_enabled: false,
+            ssl_cert_path: None,
+            ssl_key_path: None,
+        });
         configuration
     }
 
@@ -142,10 +137,14 @@ impl Configuration {
             eprintln!("Creating config file..");
             let config = Configuration::default();
             let _ = config.save_to_file(path);
-            return Err(ConfigError::Message(format!("Please edit the config.TOML in the root folder and restart the tracker.")));
+            return Err(ConfigError::Message(format!(
+                "Please edit the config.TOML in the root folder and restart the tracker."
+            )));
         }
 
-        let torrust_config: Configuration = config.try_into().map_err(|e| ConfigError::Message(format!("Errors while processing config: {}.", e)))?;
+        let torrust_config: Configuration = config
+            .try_into()
+            .map_err(|e| ConfigError::Message(format!("Errors while processing config: {}.", e)))?;
 
         Ok(torrust_config)
     }
@@ -193,7 +192,11 @@ mod tests {
 
                                 [http_api.access_tokens]
                                 admin = "MyAccessToken"
-        "#.lines().map(|line| line.trim_start()).collect::<Vec<&str>>().join("\n");
+        "#
+        .lines()
+        .map(|line| line.trim_start())
+        .collect::<Vec<&str>>()
+        .join("\n");
         config
     }
 
@@ -219,11 +222,12 @@ mod tests {
 
     #[test]
     fn configuration_should_be_saved_in_a_toml_config_file() {
-        use std::env;
-        use crate::Configuration;
-        use std::fs;
+        use std::{env, fs};
+
         use uuid::Uuid;
 
+        use crate::Configuration;
+
         // Build temp config file path
         let temp_directory = env::temp_dir();
         let temp_file = temp_directory.join(format!("test_config_{}.toml", Uuid::new_v4()));
@@ -234,24 +238,27 @@ mod tests {
 
         let default_configuration = Configuration::default();
 
-        default_configuration.save_to_file(&path).expect("Could not save configuration to file");
+        default_configuration
+            .save_to_file(&path)
+            .expect("Could not save configuration to file");
 
         let contents = fs::read_to_string(&path).expect("Something went wrong reading the file");
 
         assert_eq!(contents, default_config_toml());
     }
 
     #[cfg(test)]
-    fn create_temp_config_file_with_default_config()-> String {
+    fn create_temp_config_file_with_default_config() -> String {
         use std::env;
         use std::fs::File;
         use std::io::Write;
+
         use uuid::Uuid;
 
         // Build temp config file path
         let temp_directory = env::temp_dir();
         let temp_file = temp_directory.join(format!("test_config_{}.toml", Uuid::new_v4()));
-        
+
         // Convert to argument type for Configuration::load_from_file
         let config_file_path = temp_file.clone();
         let path = config_file_path.to_string_lossy().to_string();
@@ -282,4 +289,4 @@ mod tests {
 
         assert_eq!(format!("{}", error), "TrackerModeIncompatible");
     }
-}
+}

src/config.rs

@@ -2,10 +2,10 @@ use async_trait::async_trait;
 use derive_more::{Display, Error};
 use serde::{Deserialize, Serialize};
 
-use crate::InfoHash;
-use crate::tracker::key::AuthKey;
 use crate::databases::mysql::MysqlDatabase;
 use crate::databases::sqlite::SqliteDatabase;
+use crate::tracker::key::AuthKey;
+use crate::InfoHash;
 
 #[derive(Serialize, Deserialize, PartialEq, Debug)]
 pub enum DatabaseDrivers {
@@ -70,7 +70,7 @@ impl From<r2d2_sqlite::rusqlite::Error> for Error {
     fn from(e: r2d2_sqlite::rusqlite::Error) -> Self {
         match e {
             r2d2_sqlite::rusqlite::Error::QueryReturnedNoRows => Error::QueryReturnedNoRows,
-            _ => Error::InvalidQuery
+            _ => Error::InvalidQuery,
         }
     }
 }

src/databases/database.rs

@@ -1,3 +1,3 @@
+pub mod database;
 pub mod mysql;
 pub mod sqlite;
-pub mod database;