Skip to content

Commit dc4296c

Browse files
authored
chore: fix unused warnings (#403)
1 parent edab9fe commit dc4296c

File tree

4 files changed

+328
-171
lines changed

4 files changed

+328
-171
lines changed

refinery_cli/src/migrate.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::path::Path;
33
use anyhow::Context;
44
use refinery_core::{
55
config::{Config, ConfigDbType},
6-
find_migration_files, Migration, MigrationType, Runner, SchemaVersion, Target,
6+
find_migration_files, Migration, MigrationType, SchemaVersion, Target,
77
};
88

99
use crate::cli::MigrateArgs;
@@ -19,8 +19,7 @@ pub fn handle_migration_command(args: MigrateArgs) -> anyhow::Result<()> {
1919
args.env_var.as_deref(),
2020
&args.path,
2121
&args.table_name,
22-
)?;
23-
Ok(())
22+
)
2423
}
2524

2625
#[allow(clippy::too_many_arguments)]
@@ -73,7 +72,7 @@ fn run_migrations(
7372
.context("Can't start tokio runtime")?;
7473

7574
runtime.block_on(async {
76-
Runner::new(&migrations)
75+
refinery_core::Runner::new(&migrations)
7776
.set_grouped(grouped)
7877
.set_target(target)
7978
.set_abort_divergent(divergent)
@@ -90,7 +89,7 @@ fn run_migrations(
9089
_db_type @ (ConfigDbType::Mysql | ConfigDbType::Postgres | ConfigDbType::Sqlite) => {
9190
cfg_if::cfg_if! {
9291
if #[cfg(any(feature = "mysql", feature = "postgresql", feature = "sqlite"))] {
93-
Runner::new(&migrations)
92+
refinery_core::Runner::new(&migrations)
9493
.set_grouped(grouped)
9594
.set_abort_divergent(divergent)
9695
.set_abort_missing(missing)
@@ -103,7 +102,6 @@ fn run_migrations(
103102
}
104103
}
105104
};
106-
107105
Ok(())
108106
}
109107

refinery_cli/src/setup.rs

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,35 +59,45 @@ fn get_config_from_input() -> Result<Config> {
5959
}
6060
}
6161

62-
print!("Enter database host: ");
63-
io::stdout().flush()?;
64-
let mut db_host = String::new();
65-
io::stdin().read_line(&mut db_host)?;
66-
config = config.set_db_host(db_host.trim());
62+
cfg_if::cfg_if! {
63+
if #[cfg(any(
64+
feature = "mysql",
65+
feature = "mssql",
66+
feature = "postgresql",
67+
))]{
68+
print!("Enter database host: ");
69+
io::stdout().flush()?;
70+
let mut db_host = String::new();
71+
io::stdin().read_line(&mut db_host)?;
72+
config = config.set_db_host(db_host.trim());
6773

68-
print!("Enter database port: ");
69-
io::stdout().flush()?;
70-
let mut db_port = String::new();
71-
io::stdin().read_line(&mut db_port)?;
72-
config = config.set_db_port(db_port.trim());
74+
print!("Enter database port: ");
75+
io::stdout().flush()?;
76+
let mut db_port = String::new();
77+
io::stdin().read_line(&mut db_port)?;
78+
config = config.set_db_port(db_port.trim());
7379

74-
print!("Enter database username: ");
75-
io::stdout().flush()?;
76-
let mut db_user = String::new();
77-
io::stdin().read_line(&mut db_user)?;
78-
config = config.set_db_user(db_user.trim());
80+
print!("Enter database username: ");
81+
io::stdout().flush()?;
82+
let mut db_user = String::new();
83+
io::stdin().read_line(&mut db_user)?;
84+
config = config.set_db_user(db_user.trim());
7985

80-
print!("Enter database password: ");
81-
io::stdout().flush()?;
82-
let mut db_pass = String::new();
83-
io::stdin().read_line(&mut db_pass)?;
84-
config = config.set_db_pass(db_pass.trim());
86+
print!("Enter database password: ");
87+
io::stdout().flush()?;
88+
let mut db_pass = String::new();
89+
io::stdin().read_line(&mut db_pass)?;
90+
config = config.set_db_pass(db_pass.trim());
8591

86-
print!("Enter database name: ");
87-
io::stdout().flush()?;
88-
let mut db_name = String::new();
89-
io::stdin().read_line(&mut db_name)?;
90-
config = config.set_db_name(db_name.trim());
92+
print!("Enter database name: ");
93+
io::stdout().flush()?;
94+
let mut db_name = String::new();
95+
io::stdin().read_line(&mut db_name)?;
96+
config = config.set_db_name(db_name.trim());
9197

92-
Ok(config)
98+
Ok(config)
99+
} else {
100+
Ok(config)
101+
}
102+
}
93103
}

0 commit comments

Comments
 (0)