From a4845a44d69ecc5f664f1d7536ddbc620b201fb2 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 17 Jul 2022 10:22:20 +0300 Subject: chore: make code more idiomatic, based on clippy warnings Sponsored-by: author --- src/backup_run.rs | 4 +--- src/cmd/backup.rs | 2 +- src/config.rs | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/backup_run.rs b/src/backup_run.rs index 2418871..516e172 100644 --- a/src/backup_run.rs +++ b/src/backup_run.rs @@ -166,9 +166,7 @@ impl<'a> BackupRun<'a> { } fn checksum_kind(&self) -> LabelChecksumKind { - self.checksum_kind - .or(Some(LabelChecksumKind::Sha256)) - .unwrap() + self.checksum_kind.unwrap_or(LabelChecksumKind::Sha256) } async fn fetch_previous_generation( diff --git a/src/cmd/backup.rs b/src/cmd/backup.rs index 60045cc..80dbb1f 100644 --- a/src/cmd/backup.rs +++ b/src/cmd/backup.rs @@ -42,7 +42,7 @@ impl Backup { ) -> Result<(), ObnamError> { let runtime = SystemTime::now(); - let major = self.backup_version.or(Some(DEFAULT_SCHEMA_MAJOR)).unwrap(); + let major = self.backup_version.unwrap_or(DEFAULT_SCHEMA_MAJOR); let schema = schema_version(major)?; let client = BackupClient::new(config)?; diff --git a/src/config.rs b/src/config.rs index a9be716..5774aad 100644 --- a/src/config.rs +++ b/src/config.rs @@ -62,11 +62,11 @@ impl ClientConfig { let exclude_cache_tag_directories = tentative.exclude_cache_tag_directories.unwrap_or(true); let config = Self { - chunk_size: tentative.chunk_size.or(Some(DEFAULT_CHUNK_SIZE)).unwrap(), + chunk_size: tentative.chunk_size.unwrap_or(DEFAULT_CHUNK_SIZE), filename: filename.to_path_buf(), roots, server_url: tentative.server_url, - verify_tls_cert: tentative.verify_tls_cert.or(Some(false)).unwrap(), + verify_tls_cert: tentative.verify_tls_cert.unwrap_or(false), log, exclude_cache_tag_directories, }; -- cgit v1.2.1