Replace file field by dir and refactor code

Author: theredfish

diesel_cli/src/config.rs

@@ -70,11 +70,5 @@ impl PrintSchema {
 #[derive(Default, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct MigrationsDirectory {
-    pub file: PathBuf,
-}
-
-impl MigrationsDirectory {
-    pub fn file(&self) -> &PathBuf {
-        &self.file
-    }
+    pub dir: PathBuf,
 }

diesel_cli/src/default_files/diesel.toml

@@ -5,4 +5,4 @@
 file = "src/schema.rs"
 
 [migrations_directory]
-file = "migrations"
+dir = "migrations"

diesel_cli/src/main.rs

@@ -201,7 +201,7 @@ fn migrations_dir_from_config(matches: &ArgMatches) -> Result<PathBuf, Migration
         .migrations_directory;
 
     match migrations_dir {
-        Some(migrations_dir) => Ok(migrations_dir.file().to_owned()),
+        Some(migrations_dir) => Ok(migrations_dir.dir.to_owned()),
         None => Err(MigrationError::MigrationDirectoryNotFound),
     }
 }

diesel_cli/tests/database_reset.rs

@@ -202,7 +202,7 @@ fn reset_respects_migrations_dir_from_diesel_toml() {
             "diesel.toml",
             r#"
             [migrations_directory]
-            file = "custom_migrations"
+            dir = "custom_migrations"
             "#,
         )
         .build();

diesel_cli/tests/database_setup.rs

@@ -156,7 +156,7 @@ fn database_setup_respects_migrations_dir_from_diesel_toml() {
             "diesel.toml",
             r#"
             [migrations_directory]
-            file = "custom_migrations"
+            dir = "custom_migrations"
             "#,
         )
         .build();

diesel_cli/tests/migration_generate.rs

@@ -163,7 +163,7 @@ fn migration_generate_respects_migrations_dir_from_diesel_toml() {
             "diesel.toml",
             r#"
             [migrations_directory]
-            file = "custom_migrations"
+            dir = "custom_migrations"
             "#,
         )
         .build();

diesel_cli/tests/migration_list.rs

@@ -176,7 +176,7 @@ fn migration_list_respects_migrations_dir_from_diesel_toml() {
             "diesel.toml",
             r#"
             [migrations_directory]
-            file = "custom_migrations"
+            dir = "custom_migrations"
             "#,
         )
         .build();

diesel_cli/tests/migration_redo.rs

@@ -145,7 +145,7 @@ fn migration_redo_respects_migrations_dir_from_diesel_toml() {
             "diesel.toml",
             r#"
             [migrations_directory]
-            file = "custom_migrations"
+            dir = "custom_migrations"
             "#,
         )
         .build();

diesel_cli/tests/migration_revert.rs

@@ -99,7 +99,7 @@ fn migration_revert_respects_migration_dir_from_diesel_toml() {
             "diesel.toml",
             r#"
             [migrations_directory]
-            file = "custom_migrations"
+            dir = "custom_migrations"
             "#,
         )
         .build();

diesel_cli/tests/migration_run.rs

@@ -517,7 +517,7 @@ fn migration_run_runs_pending_migrations_custom_migrations_dir_from_diesel_toml(
             "diesel.toml",
             r#"
             [migrations_directory]
-            file = "custom_migrations"
+            dir = "custom_migrations"
             "#,
         )
         .build();