From c8940bae1ce2f03d625a334800b109ad2eff0834 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Mon, 23 Aug 2021 10:18:03 +0300 Subject: [PATCH] fix: clippy warnings --- migra/src/fs.rs | 2 +- migra/src/migration.rs | 4 ++-- migra_cli/src/commands/downgrade.rs | 2 +- migra_cli/src/commands/upgrade.rs | 2 +- migra_cli/src/config.rs | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/migra/src/fs.rs b/migra/src/fs.rs index 157f8fb..7e9bc34 100644 --- a/migra/src/fs.rs +++ b/migra/src/fs.rs @@ -21,7 +21,7 @@ pub fn get_all_migrations(dir_path: &Path) -> MigraResult { Err(e) if e.kind() == io::ErrorKind::NotFound => vec![], entries => entries? .filter_map(|res| res.ok().map(|e| e.path())) - .filter(|path| is_migration_dir(&path)) + .filter(|path| is_migration_dir(path)) .collect::>(), }; diff --git a/migra/src/migration.rs b/migra/src/migration.rs index 77ca120..c15c599 100644 --- a/migra/src/migration.rs +++ b/migra/src/migration.rs @@ -98,7 +98,7 @@ impl List { /// Push migration to list. pub fn push(&mut self, migration: Migration) { - self.inner.push(migration) + self.inner.push(migration); } /// Push migration name to list. @@ -120,7 +120,7 @@ impl List { /// # assert_eq!(list, List::from(vec!["name"])); /// ``` pub fn push_name(&mut self, name: &str) { - self.inner.push(Migration::new(name)) + self.inner.push(Migration::new(name)); } /// Check if list contains specific migration. diff --git a/migra_cli/src/commands/downgrade.rs b/migra_cli/src/commands/downgrade.rs index af7b3bb..a836db0 100644 --- a/migra_cli/src/commands/downgrade.rs +++ b/migra_cli/src/commands/downgrade.rs @@ -38,7 +38,7 @@ pub(crate) fn rollback_applied_migrations( .try_for_each(|(migration_name, content)| { if all_migrations.contains_name(migration_name) { println!("downgrade {}...", migration_name); - client.run_downgrade_migration(migration_name, &content) + client.run_downgrade_migration(migration_name, content) } else { Ok(()) } diff --git a/migra_cli/src/commands/upgrade.rs b/migra_cli/src/commands/upgrade.rs index f927e06..dedf10b 100644 --- a/migra_cli/src/commands/upgrade.rs +++ b/migra_cli/src/commands/upgrade.rs @@ -57,7 +57,7 @@ pub(crate) fn upgrade_pending_migrations( .iter() .try_for_each(|(migration_name, content)| { println!("upgrade {}...", migration_name); - client.run_upgrade_migration(migration_name, &content) + client.run_upgrade_migration(migration_name, content) }) .map_err(From::from) })?; diff --git a/migra_cli/src/config.rs b/migra_cli/src/config.rs index 479c9e4..4b90ea1 100644 --- a/migra_cli/src/config.rs +++ b/migra_cli/src/config.rs @@ -138,7 +138,7 @@ impl DatabaseConfig { } pub fn connection_string(&self) -> MigraResult { - self.connection.strip_prefix("$").map_or_else( + self.connection.strip_prefix('$').map_or_else( || Ok(self.connection.clone()), |connection_env| { env::var(connection_env) @@ -183,7 +183,7 @@ impl Default for MigrationsConfig { impl MigrationsConfig { pub fn directory(&self) -> String { - self.directory.strip_prefix("$").map_or_else( + self.directory.strip_prefix('$').map_or_else( || self.directory.clone(), |directory_env| { env::var(directory_env).unwrap_or_else(|_| { @@ -199,7 +199,7 @@ impl MigrationsConfig { } pub fn table_name(&self) -> String { - self.table_name.strip_prefix("$").map_or_else( + self.table_name.strip_prefix('$').map_or_else( || self.table_name.clone(), |table_name_env| { env::var(table_name_env).unwrap_or_else(|_| {