From 2b4608e06b9a39ce0b36e3979f887939fd6edc14 Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <olivier@librepush.net>
Date: Fri, 26 May 2023 22:58:41 +0100
Subject: [PATCH] Cleanups

---
 datman/src/backup.rs          | 7 +++++--
 yama_pile/src/tree.rs         | 6 +++---
 yama_wormfile_sftp/src/lib.rs | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/datman/src/backup.rs b/datman/src/backup.rs
index 8db181c..eb3a6a1 100644
--- a/datman/src/backup.rs
+++ b/datman/src/backup.rs
@@ -2,7 +2,7 @@ use crate::descriptor_config::{SourceDescriptor, SourceDescriptorInner, VirtualS
 use crate::pointer_names::{get_pointer_name_at, POINTER_NAME_DATETIME_SPLITTER};
 use chrono::{DateTime, Utc};
 use dashmap::DashSet;
-use eyre::{bail, eyre, Context, ContextCompat, ensure};
+use eyre::{bail, ensure, eyre, Context, ContextCompat};
 use indicatif::ProgressStyle;
 use patricia_tree::PatriciaMap;
 use std::borrow::Cow;
@@ -352,7 +352,10 @@ async fn backup_dir_sources(
     submitter_task?;
     receiver_task?;
 
-    ensure!(completed == submitted, "completed: {completed:?} != submitted {submitted:?}");
+    ensure!(
+        completed == submitted,
+        "completed: {completed:?} != submitted {submitted:?}"
+    );
 
     assert_eq!(dir_sources.len(), chunk_file_maps.len());
 
diff --git a/yama_pile/src/tree.rs b/yama_pile/src/tree.rs
index f860494..3d0e7fa 100644
--- a/yama_pile/src/tree.rs
+++ b/yama_pile/src/tree.rs
@@ -409,9 +409,9 @@ pub fn assemble_tree_from_scan_entries(
                 permissions,
                 size: _unverified_size_ignore,
             } => {
-                let (content, size) = chunkings
-                    .remove(&key_string)
-                    .with_context(|| format!("bad chunkings PMap: missing entry: {key_string:?}"))?;
+                let (content, size) = chunkings.remove(&key_string).with_context(|| {
+                    format!("bad chunkings PMap: missing entry: {key_string:?}")
+                })?;
 
                 // note: for the root, this inserts the root file entry as a child called "" within a fake root 'directory'.
                 // That's fine. We'll patch this up later.
diff --git a/yama_wormfile_sftp/src/lib.rs b/yama_wormfile_sftp/src/lib.rs
index 740ceee..550e240 100644
--- a/yama_wormfile_sftp/src/lib.rs
+++ b/yama_wormfile_sftp/src/lib.rs
@@ -15,7 +15,7 @@ use std::io::{ErrorKind, SeekFrom};
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
 use std::sync::Arc;
-use std::task::{ready, Context, Poll};
+use std::task::{Context, Poll};
 use std::time::Duration;
 use tokio::io::{AsyncRead, AsyncSeek, AsyncWrite, AsyncWriteExt, ReadBuf};
 use tokio_stream::StreamExt;