From 0f198b82f5e728dfea6748265bf2e1291390f767 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 28 Apr 2022 10:26:00 +0200 Subject: [PATCH] cargo fmt Signed-off-by: Thomas Lamprecht --- pbs-datastore/src/backup_info.rs | 2 +- proxmox-restore-daemon/src/main.rs | 12 ++++++++++-- src/backup/verify.rs | 5 +---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs index 2f1eaa6f..30275b22 100644 --- a/pbs-datastore/src/backup_info.rs +++ b/pbs-datastore/src/backup_info.rs @@ -11,7 +11,7 @@ use pbs_api_types::{BackupType, GroupFilter, BACKUP_DATE_REGEX, BACKUP_FILE_REGE use pbs_config::{open_backup_lockfile, BackupLockGuard}; use crate::manifest::{MANIFEST_BLOB_NAME, MANIFEST_LOCK_NAME}; -use crate::{DataStore, DataBlob}; +use crate::{DataBlob, DataStore}; /// BackupGroup is a directory containing a list of BackupDir #[derive(Clone)] diff --git a/proxmox-restore-daemon/src/main.rs b/proxmox-restore-daemon/src/main.rs index 96e40de9..03eb2344 100644 --- a/proxmox-restore-daemon/src/main.rs +++ b/proxmox-restore-daemon/src/main.rs @@ -96,7 +96,12 @@ async fn run() -> Result<(), Error> { watchdog_init(); let init_future = async move { - match tokio::time::timeout(std::time::Duration::from_secs(120), tokio::task::spawn_blocking(init_disk_state)).await { + match tokio::time::timeout( + std::time::Duration::from_secs(120), + tokio::task::spawn_blocking(init_disk_state), + ) + .await + { Ok(res) => res.map_err(|err| format_err!("disk init failed: {}", err)), Err(_) => bail!("disk init timed out after 120 seconds"), } @@ -114,7 +119,10 @@ async fn run() -> Result<(), Error> { let acceptor = hyper::server::accept::from_stream(receiver_stream); let hyper_future = async move { - hyper::Server::builder(acceptor).serve(rest_server).await.map_err(|err| format_err!("hyper finished with error: {}", err)) + hyper::Server::builder(acceptor) + .serve(rest_server) + .await + .map_err(|err| format_err!("hyper finished with error: {}", err)) }; tokio::try_join!(init_future, hyper_future)?; diff --git a/src/backup/verify.rs b/src/backup/verify.rs index ee7f38b7..7d5d3539 100644 --- a/src/backup/verify.rs +++ b/src/backup/verify.rs @@ -40,10 +40,7 @@ impl VerifyWorker { } } -fn verify_blob( - backup_dir: &BackupDir, - info: &FileInfo, -) -> Result<(), Error> { +fn verify_blob(backup_dir: &BackupDir, info: &FileInfo) -> Result<(), Error> { let blob = backup_dir.load_blob(&info.filename)?; let raw_size = blob.raw_size();