diff options
Diffstat (limited to 'src/cmd/backup.rs')
-rw-r--r-- | src/cmd/backup.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cmd/backup.rs b/src/cmd/backup.rs index 80dbb1f..70e9eac 100644 --- a/src/cmd/backup.rs +++ b/src/cmd/backup.rs @@ -10,21 +10,21 @@ use crate::generation::GenId; use crate::performance::{Clock, Performance}; use crate::schema::VersionComponent; +use clap::Parser; use log::info; use std::time::SystemTime; -use structopt::StructOpt; use tempfile::tempdir; use tokio::runtime::Runtime; /// Make a backup. -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct Backup { /// Force a full backup, instead of an incremental one. - #[structopt(long)] + #[clap(long)] full: bool, /// Backup schema major version to use. - #[structopt(long)] + #[clap(long)] backup_version: Option<VersionComponent>, } @@ -45,7 +45,7 @@ impl Backup { let major = self.backup_version.unwrap_or(DEFAULT_SCHEMA_MAJOR); let schema = schema_version(major)?; - let client = BackupClient::new(config)?; + let mut client = BackupClient::new(config)?; let trust = client .get_client_trust() .await? @@ -68,7 +68,7 @@ impl Backup { let (is_incremental, outcome) = if let Some(old_id) = old_id { info!("incremental backup based on {}", old_id); - let mut run = BackupRun::incremental(config, &client)?; + let mut run = BackupRun::incremental(config, &mut client)?; let old = run.start(Some(&old_id), &oldtemp, perf).await?; ( true, @@ -77,7 +77,7 @@ impl Backup { ) } else { info!("fresh backup without a previous generation"); - let mut run = BackupRun::initial(config, &client)?; + let mut run = BackupRun::initial(config, &mut client)?; let old = run.start(None, &oldtemp, perf).await?; ( false, |