address review comments

Author: pietroalbini

src/config.rs

@@ -1,4 +1,4 @@
-use crate::storage::StorageBackendKind;
+use crate::storage::StorageKind;
 use failure::{bail, format_err, Error, Fail, ResultExt};
 use rusoto_core::Region;
 use std::env::VarError;
@@ -19,7 +19,7 @@ pub struct Config {
     pub(crate) min_pool_idle: u32,
 
     // Storage params
-    pub(crate) storage_backend: StorageBackendKind,
+    pub(crate) storage_backend: StorageKind,
 
     // S3 params
     pub(crate) s3_bucket: String,
@@ -55,7 +55,7 @@ impl Config {
             max_pool_size: env("DOCSRS_MAX_POOL_SIZE", 90)?,
             min_pool_idle: env("DOCSRS_MIN_POOL_IDLE", 10)?,
 
-            storage_backend: env("DOCSRS_STORAGE_BACKEND", StorageBackendKind::Database)?,
+            storage_backend: env("DOCSRS_STORAGE_BACKEND", StorageKind::Database)?,
 
             s3_bucket: env("DOCSRS_S3_BUCKET", "rust-docs-rs".to_string())?,
             s3_region: env("S3_REGION", Region::UsWest1)?,

src/storage/mod.rs

@@ -72,18 +72,18 @@ pub fn get_file_list<P: AsRef<Path>>(path: P) -> Result<Vec<PathBuf>, Error> {
 pub(crate) struct InvalidStorageBackendError;
 
 #[derive(Debug)]
-pub(crate) enum StorageBackendKind {
+pub(crate) enum StorageKind {
     Database,
     S3,
 }
 
-impl std::str::FromStr for StorageBackendKind {
+impl std::str::FromStr for StorageKind {
     type Err = InvalidStorageBackendError;
 
     fn from_str(input: &str) -> Result<Self, Self::Err> {
         match input {
-            "database" => Ok(StorageBackendKind::Database),
-            "s3" => Ok(StorageBackendKind::S3),
+            "database" => Ok(StorageKind::Database),
+            "s3" => Ok(StorageKind::S3),
             _ => Err(InvalidStorageBackendError),
         }
     }
@@ -102,12 +102,10 @@ impl Storage {
     pub fn new(pool: Pool, metrics: Arc<Metrics>, config: &Config) -> Result<Self, Error> {
         Ok(Storage {
             backend: match config.storage_backend {
-                StorageBackendKind::Database => {
+                StorageKind::Database => {
                     StorageBackend::Database(DatabaseBackend::new(pool, metrics))
                 }
-                StorageBackendKind::S3 => {
-                    StorageBackend::S3(Box::new(S3Backend::new(metrics, config)?))
-                }
+                StorageKind::S3 => StorageBackend::S3(Box::new(S3Backend::new(metrics, config)?)),
             },
         })
     }
@@ -579,7 +577,7 @@ mod backend_tests {
             $(
                 mod $backend {
                     use crate::test::TestEnvironment;
-                    use crate::storage::{Storage, StorageBackendKind};
+                    use crate::storage::{Storage, StorageKind};
                     use std::sync::Arc;
 
                     fn get_storage(env: &TestEnvironment) -> Arc<Storage> {
@@ -618,8 +616,8 @@ mod backend_tests {
 
     backend_tests! {
         backends {
-            s3 => StorageBackendKind::S3,
-            database => StorageBackendKind::Database,
+            s3 => StorageKind::S3,
+            database => StorageKind::Database,
         }
 
         tests {

src/storage/s3.rs

@@ -39,7 +39,7 @@ impl S3Backend {
                     name: config.s3_region.name().to_string(),
                     endpoint: endpoint.to_string(),
                 })
-                .unwrap_or(config.s3_region.clone()),
+                .unwrap_or_else(|| config.s3_region.clone()),
         );
 
         #[cfg(test)]

src/test/mod.rs

@@ -1,7 +1,7 @@
 mod fakes;
 
 use crate::db::{Pool, PoolClient};
-use crate::storage::{Storage, StorageBackendKind};
+use crate::storage::{Storage, StorageKind};
 use crate::web::Server;
 use crate::{BuildQueue, Config, Context, Metrics};
 use failure::Error;
@@ -139,7 +139,7 @@ impl TestEnvironment {
         config.min_pool_idle = 0;
 
         // Use the database for storage, as it's faster than S3.
-        config.storage_backend = StorageBackendKind::Database;
+        config.storage_backend = StorageKind::Database;
 
         // Use a temporary S3 bucket.
         config.s3_bucket = format!("docsrs-test-bucket-{}", rand::random::<u64>());