clippy and fmt

Author: Auspicus

martin/src/args/srv.rs

@@ -91,7 +91,7 @@ impl SrvArgs {
             srv_config.preferred_encoding = self.preferred_encoding;
         }
         if let Some(v) = self.validate {
-            srv_config.validate = v
+            srv_config.validate = v;
         }
         if let Some(v) = self.on_invalid {
             srv_config.on_invalid = v;

martin/src/config.rs

@@ -10,7 +10,6 @@ use log::{info, warn};
 use serde::{Deserialize, Serialize};
 use subst::VariableMap;
 
-use crate::file_config::OnInvalid;
 use crate::MartinError::{ConfigLoadError, ConfigParseError, ConfigWriteError, NoSources};
 #[cfg(any(feature = "fonts", feature = "postgres"))]
 use crate::OptOneMany;
@@ -21,6 +20,7 @@ use crate::OptOneMany;
     feature = "cog"
 ))]
 use crate::file_config::FileConfigEnum;
+use crate::file_config::OnInvalid;
 use crate::source::{TileInfoSources, TileSources};
 use crate::srv::{RESERVED_KEYWORDS, SrvConfig};
 use crate::utils::{CacheValue, MainCache, OptMainCache, init_aws_lc_tls, parse_base_path};
@@ -210,29 +210,28 @@ impl Config {
             sources.push(Box::pin(val));
         }
 
-        let resolved_sources = try_join_all(sources).await?
+        let resolved_sources = try_join_all(sources)
+            .await?
             .into_iter()
             .flatten()
             .collect::<TileInfoSources>();
-        
+
         let mut sources_to_prune: Vec<usize> = vec![];
         for (idx, source) in resolved_sources.iter().enumerate() {
             let validation_result = source.validate(self.srv.validate).await;
             if let Err(e) = validation_result {
                 match self.srv.on_invalid {
-                    OnInvalid::Abort => {
-                        return MartinResult::Err(e)
-                    },
+                    OnInvalid::Abort => return MartinResult::Err(e),
                     OnInvalid::Warn => {
                         warn!(
                             "Source {} failed validation, this may cause performance issues: {}",
                             source.get_id(),
-                            e.to_string()
+                            e
                         );
-                    },
+                    }
                     OnInvalid::Ignore => {
-                        sources_to_prune.push(idx)
-                    },
+                        sources_to_prune.push(idx);
+                    }
                 }
             }
         }

martin/src/file_config.rs

@@ -9,14 +9,14 @@ use log::{info, warn};
 use serde::{Deserialize, Serialize};
 use url::Url;
 
+use crate::MartinResult;
 use crate::OptOneMany::{Many, One};
 use crate::config::{UnrecognizedValues, copy_unrecognized_config};
 use crate::file_config::FileError::{
     InvalidFilePath, InvalidSourceFilePath, InvalidSourceUrl, IoError,
 };
 use crate::source::{TileInfoSource, TileInfoSources};
 use crate::utils::{IdResolver, OptMainCache, OptOneMany};
-use crate::{MartinResult, Source};
 
 pub type FileResult<T> = Result<T, FileError>;
 
@@ -433,17 +433,3 @@ fn parse_url(is_enabled: bool, path: &Path) -> Result<Option<Url>, FileError> {
         .map(|v| Url::parse(v).map_err(|e| InvalidSourceUrl(e, v.to_string())))
         .transpose()
 }
-
-fn maybe_add_source(
-    results: &mut Vec<Box<dyn Source>>,
-    result: FileResult<TileInfoSource>,
-) -> Result<(), FileError> {
-    match result {
-        Err(FileError::IgnoreOnInvalid(_, _)) => Ok(()),
-        Err(e) => Err(e),
-        Ok(src) => {
-            results.push(src);
-            Ok(())
-        }
-    }
-}

martin/src/mbtiles/mod.rs

@@ -13,7 +13,7 @@ use url::Url;
 
 use crate::config::UnrecognizedValues;
 use crate::file_config::FileError::{AcquireConnError, InvalidMetadata, IoError};
-use crate::file_config::{ConfigExtras, FileResult, OnInvalid, SourceConfigExtras, ValidationLevel};
+use crate::file_config::{ConfigExtras, FileResult, SourceConfigExtras, ValidationLevel};
 use crate::source::{TileData, TileInfoSource, UrlQuery};
 use crate::{MartinError, MartinResult, Source};
 
@@ -122,7 +122,6 @@ impl Source for MbtSource {
                 .validate_fast()
                 .await
                 .map_err(MartinError::from),
-            _ => Ok(()),
         }
     }
 

martin/src/pg/pg_source.rs

@@ -6,8 +6,8 @@ use martin_tile_utils::Format::Mvt;
 use martin_tile_utils::{TileCoord, TileInfo};
 use tilejson::TileJSON;
 
-use crate::file_config::ValidationLevel;
 use crate::MartinResult;
+use crate::file_config::ValidationLevel;
 use crate::pg::PgError::{GetTileError, GetTileWithQueryError, PrepareQueryError};
 use crate::pg::pool::PgPool;
 use crate::pg::utils::query_to_json;

martin/src/pmtiles/mod.rs

@@ -19,7 +19,9 @@ use url::Url;
 
 use crate::config::UnrecognizedValues;
 use crate::file_config::FileError::{InvalidMetadata, InvalidUrlMetadata, IoError};
-use crate::file_config::{ConfigExtras, FileError, FileResult, SourceConfigExtras, ValidationLevel};
+use crate::file_config::{
+    ConfigExtras, FileError, FileResult, SourceConfigExtras, ValidationLevel,
+};
 use crate::source::{TileInfoSource, UrlQuery};
 use crate::utils::cache::get_cached_value;
 use crate::utils::{CacheKey, CacheValue, OptMainCache};

martin/src/source.rs

@@ -9,7 +9,7 @@ use martin_tile_utils::{TileCoord, TileInfo};
 use serde::{Deserialize, Serialize};
 use tilejson::TileJSON;
 
-use crate::{file_config::{OnInvalid, ValidationLevel}, MartinResult};
+use crate::{MartinResult, file_config::ValidationLevel};
 
 pub type TileData = Vec<u8>;
 pub type UrlQuery = HashMap<String, String>;

martin/src/srv/server.rs

@@ -212,8 +212,8 @@ pub mod tests {
     use tilejson::TileJSON;
 
     use super::*;
-    use crate::file_config::ValidationLevel;
     use crate::UrlQuery;
+    use crate::file_config::ValidationLevel;
     use crate::source::{Source, TileData, TileInfoSource};
 
     #[derive(Debug, Clone)]

martin/src/srv/tiles.rs

@@ -357,10 +357,7 @@ mod tests {
             tj: tilejson! { tiles: vec![] },
             data: Vec::default(),
         };
-        let sources = TileSources::new(vec![
-            Box::new(non_empty_source),
-            Box::new(empty_source),
-        ]);
+        let sources = TileSources::new(vec![Box::new(non_empty_source), Box::new(empty_source)]);
 
         for (source_id, expected) in &[
             ("non-empty", vec![1_u8, 2, 3]),