Clean code with clippy and rustfmt

Author: theredfish

diesel_cli/src/main.rs

@@ -56,7 +56,7 @@ use std::{env, fs};
 use self::config::Config;
 use self::database_error::{DatabaseError, DatabaseResult};
 use migrations::MigrationError;
-use migrations_internals::{TIMESTAMP_FORMAT};
+use migrations_internals::TIMESTAMP_FORMAT;
 
 fn main() {
     use self::dotenv::dotenv;
@@ -209,7 +209,7 @@ fn migrations_dir_from_config(matches: &ArgMatches) -> Result<PathBuf, Migration
 
     match migrations_dir {
         Some(migrations_dir) => Ok(migrations_dir.file().to_owned()),
-        None => Err(MigrationError::MigrationDirectoryNotFound)
+        None => Err(MigrationError::MigrationDirectoryNotFound),
     }
 }
 
@@ -232,8 +232,9 @@ fn create_migrations_dir(matches: &ArgMatches) -> DatabaseResult<PathBuf> {
             // Retreives and transforms the path of the migrations
             // directory from the configuration file or returns the
             // default one.
-            migrations_dir_from_config.ok()
-                .unwrap_or(project_root.join("migrations"))
+            migrations_dir_from_config
+                .ok()
+                .unwrap_or_else(|| project_root.join("migrations"))
         });
 
     if !dir.exists() {

diesel_cli/tests/database_reset.rs

@@ -221,13 +221,10 @@ fn reset_respects_migrations_dir_from_diesel_toml() {
     assert!(db.table_exists("posts"));
     assert!(db.table_exists("users"));
 
-    let result = p
-        .command("database")
-        .arg("reset")
-        .run();
+    let result = p.command("database").arg("reset").run();
 
     assert!(result.is_success(), "Result was unsuccessful {:?}", result);
     assert!(!db.table_exists("posts"));
     assert!(db.table_exists("users"));
     assert!(db.table_exists("__diesel_schema_migrations"));
-}
+}

diesel_cli/tests/database_setup.rs

@@ -172,10 +172,7 @@ fn database_setup_respects_migrations_dir_from_diesel_toml() {
     // sanity check
     assert!(!db.exists());
 
-    let result = p
-        .command("database")
-        .arg("setup")
-        .run();
+    let result = p.command("database").arg("setup").run();
 
     assert!(result.is_success(), "Result was unsuccessful {:?}", result);
     assert!(

diesel_cli/tests/migration_generate.rs

@@ -187,4 +187,4 @@ Creating custom_migrations.12345_stuff.down.sql
 
     assert!(p.has_file("custom_migrations/12345_stuff/up.sql"));
     assert!(p.has_file("custom_migrations/12345_stuff/down.sql"));
-}
+}

diesel_cli/tests/migration_list.rs

@@ -206,4 +206,4 @@ fn migration_list_respects_migrations_dir_from_diesel_toml() {
     let result = p.command("migration").arg("list").run();
     assert!(result.is_success(), "Result was unsuccessful {:?}", result);
     assert!(result.stdout().contains("[X] 12345_create_users_table"));
-}
+}

diesel_cli/tests/migration_redo.rs

@@ -160,10 +160,7 @@ fn migration_redo_respects_migrations_dir_from_diesel_toml() {
     // Make sure the project is setup
     p.command("setup").run();
 
-    let result = p
-        .command("migration")
-        .arg("redo")
-        .run();
+    let result = p.command("migration").arg("redo").run();
 
     let expected_stdout = "\
 Rolling back migration 12345_create_users_table
@@ -176,4 +173,4 @@ Running migration 12345_create_users_table
         "Unexpected stdout {}",
         result.stdout()
     );
-}
+}

diesel_cli/tests/migration_revert.rs

@@ -118,10 +118,7 @@ fn migration_revert_respects_migration_dir_from_diesel_toml() {
 
     assert!(db.table_exists("users"));
 
-    let result = p
-        .command("migration")
-        .arg("revert")
-        .run();
+    let result = p.command("migration").arg("revert").run();
 
     assert!(result.is_success(), "Result was unsuccessful {:?}", result);
     assert!(
@@ -130,4 +127,4 @@ fn migration_revert_respects_migration_dir_from_diesel_toml() {
         result.stdout()
     );
     assert!(!db.table_exists("users"));
-}
+}

diesel_cli/tests/migration_run.rs

@@ -537,10 +537,7 @@ fn migration_run_runs_pending_migrations_custom_migrations_dir_from_diesel_toml(
 
     assert!(!db.table_exists("users"));
 
-    let result = p
-        .command("migration")
-        .arg("run")
-        .run();
+    let result = p.command("migration").arg("run").run();
 
     assert!(result.is_success(), "Result was unsuccessful {:?}", result);
     assert!(
@@ -549,4 +546,4 @@ fn migration_run_runs_pending_migrations_custom_migrations_dir_from_diesel_toml(
         result.stdout()
     );
     assert!(db.table_exists("users"));
-}
+}

diesel_cli/tests/setup.rs

@@ -255,9 +255,7 @@ fn setup_respects_migrations_dir_from_diesel_toml() {
 
     assert!(!p.has_file("custom_migrations"));
 
-    let result = p
-        .command("setup")
-        .run();
+    let result = p.command("setup").run();
 
     assert!(result.is_success(), "Result was unsuccessful {:?}", result);
     assert!(p.has_file("custom_migrations"));