cargo fmt

I think it changed for Rust 2024?

Author: sourcefrog

src/archive.rs

@@ -409,12 +409,12 @@ mod test {
     use std::fs;
     use std::io::Read;
 
-    use assert_fs::prelude::*;
     use assert_fs::TempDir;
+    use assert_fs::prelude::*;
 
     use crate::monitor::test::TestMonitor;
-    use crate::test_fixtures::store_two_versions;
     use crate::test_fixtures::TreeFixture;
+    use crate::test_fixtures::store_two_versions;
 
     #[tokio::test]
     async fn create_then_open_archive() {
@@ -452,12 +452,13 @@ mod test {
         let af = Archive::create_temp().await;
 
         assert!(af.transport().local_path().unwrap().is_dir());
-        assert!(af
-            .transport()
-            .local_path()
-            .unwrap()
-            .join("CONSERVE")
-            .is_file());
+        assert!(
+            af.transport()
+                .local_path()
+                .unwrap()
+                .join("CONSERVE")
+                .is_file()
+        );
         assert!(af.transport().local_path().unwrap().join("d").is_dir());
 
         let header_path = af.transport().local_path().unwrap().join("CONSERVE");

src/backup.rs

@@ -18,8 +18,8 @@ use std::fmt;
 use std::io::prelude::*;
 use std::mem::take;
 use std::path::Path;
-use std::sync::atomic::Ordering::Relaxed;
 use std::sync::Arc;
+use std::sync::atomic::Ordering::Relaxed;
 use std::time::{Duration, Instant};
 
 use bytes::BytesMut;
@@ -657,16 +657,16 @@ mod test {
     use std::sync::Arc;
     use std::sync::Mutex;
 
-    use assert_fs::{prelude::*, TempDir};
+    use assert_fs::{TempDir, prelude::*};
 
-    use filetime::{set_file_mtime, FileTime};
+    use filetime::{FileTime, set_file_mtime};
     use tracing_test::traced_test;
 
     use crate::counters::Counter;
     use crate::monitor::test::TestMonitor;
     use crate::test_fixtures::TreeFixture;
-    use crate::transport::record::Verb;
     use crate::transport::Transport;
+    use crate::transport::record::Verb;
     use crate::*;
 
     use super::*;
@@ -717,8 +717,7 @@ mod test {
         assert_eq!(change.to_string(), "- /a");
     }
 
-    const HELLO_HASH: &str =
-        "9063990e5c5b2184877f92adace7c801a549b00c39cd7549877f06d5dd0d3a6ca6eee42d5\
+    const HELLO_HASH: &str = "9063990e5c5b2184877f92adace7c801a549b00c39cd7549877f06d5dd0d3a6ca6eee42d5\
      896bdac64831c8114c55cee664078bd105dc691270c92644ccb2ce7";
 
     #[tokio::test]
@@ -1464,9 +1463,11 @@ mod test {
             ["GC_LOCK", "b0000/BANDTAIL"],
             "don't get metadata for data blocks"
         );
-        assert!(metadata_calls
-            .iter()
-            .all(|c| c.ends_with("BANDTAIL") || c.ends_with("GC_LOCK")));
+        assert!(
+            metadata_calls
+                .iter()
+                .all(|c| c.ends_with("BANDTAIL") || c.ends_with("GC_LOCK"))
+        );
 
         // Change one of the files, and in a new backup it should be recognized
         // as unmodified.
@@ -1493,7 +1494,8 @@ mod test {
         let metadata_calls = recording.verb_paths(Verb::Metadata);
         println!("metadata calls for third backup after modification: {metadata_calls:#?}");
         assert_eq!(
-            metadata_calls, ["GC_LOCK", "b0001/BANDTAIL"],
+            metadata_calls,
+            ["GC_LOCK", "b0001/BANDTAIL"],
             "with modification to one file, backup is expected to get metadata for lock and previous band tail: {metadata_calls:#?}"
         );
     }

src/bin/conserve.rs

@@ -20,15 +20,15 @@ use std::path::{Path, PathBuf};
 use std::sync::{Arc, RwLock};
 use std::time::Instant;
 
-use clap::builder::{styling, Styles};
+use clap::builder::{Styles, styling};
 use clap::{Parser, Subcommand};
 use conserve::change::Change;
 use time::UtcOffset;
 #[allow(unused_imports)]
-use tracing::{debug, error, info, trace, warn, Level};
+use tracing::{Level, debug, error, info, trace, warn};
 
 use crate::transport::Transport;
-use conserve::termui::{enable_tracing, TermUiMonitor, TraceTimeStyle};
+use conserve::termui::{TermUiMonitor, TraceTimeStyle, enable_tracing};
 use conserve::*;
 
 /// Local timezone offset, calculated once at startup, to avoid issues about

src/blockhash.rs

@@ -18,7 +18,7 @@ use std::fmt::{Debug, Display};
 use std::hash::{Hash, Hasher};
 use std::str::FromStr;
 
-use blake2_rfc::blake2b::{blake2b, Blake2bResult};
+use blake2_rfc::blake2b::{Blake2bResult, blake2b};
 use serde::{Deserialize, Serialize};
 
 use crate::*;

src/counters.rs

@@ -151,9 +151,11 @@ mod test {
             assert_eq!(counters.get(c), v);
         });
         assert_eq!(counters.iter().count(), Counter::COUNT);
-        assert!(counters
-            .iter()
-            .all(|(c, v)| (c == Counter::Files) == (v == 2)));
+        assert!(
+            counters
+                .iter()
+                .all(|(c, v)| (c == Counter::Files) == (v == 2))
+        );
     }
 
     #[test]

src/diff.rs

@@ -89,7 +89,7 @@ impl Diff {
 
 #[cfg(test)]
 mod tests {
-    use filetime::{set_file_mtime, FileTime};
+    use filetime::{FileTime, set_file_mtime};
 
     use crate::monitor::test::TestMonitor;
     use crate::test_fixtures::TreeFixture;

src/index/write.rs

@@ -23,7 +23,7 @@ use crate::monitor::Monitor;
 use crate::transport::{Transport, WriteMode};
 use crate::*;
 
-use super::{hunk_relpath, subdir_relpath, HUNKS_PER_SUBDIR};
+use super::{HUNKS_PER_SUBDIR, hunk_relpath, subdir_relpath};
 
 /// Write out index hunks.
 ///

src/jsonio.rs

@@ -156,9 +156,11 @@ mod tests {
     #[tokio::test]
     async fn read_json_is_none_for_nonexistent_files() {
         let transport = Transport::temp();
-        assert!(read_json::<TestContents>(&transport, "nonexistent.json")
-            .await
-            .expect("No error for nonexistent file")
-            .is_none());
+        assert!(
+            read_json::<TestContents>(&transport, "nonexistent.json")
+                .await
+                .expect("No error for nonexistent file")
+                .is_none()
+        );
     }
 }

src/lib.rs

@@ -53,24 +53,24 @@ pub mod validate;
 pub use crate::apath::Apath;
 pub use crate::archive::Archive;
 pub use crate::archive::DeleteOptions;
-pub use crate::backup::{backup, BackupOptions, BackupStats};
+pub use crate::backup::{BackupOptions, BackupStats, backup};
 pub use crate::band::{Band, BandSelectionPolicy};
 pub use crate::bandid::BandId;
 pub use crate::blockhash::BlockHash;
 pub use crate::change::{ChangeCallback, EntryChange};
-pub use crate::diff::{diff, DiffOptions};
+pub use crate::diff::{DiffOptions, diff};
 pub use crate::entry::EntryTrait;
 pub use crate::errors::Error;
 pub use crate::excludes::Exclude;
 pub use crate::gc_lock::GarbageCollectionLock;
-pub use crate::index::{entry::IndexEntry, IndexRead, IndexWriter};
+pub use crate::index::{IndexRead, IndexWriter, entry::IndexEntry};
 pub use crate::kind::Kind;
 pub use crate::merge::MergeTrees;
 pub use crate::misc::bytes_to_human_mb;
-pub use crate::mount::{mount, MountOptions};
+pub use crate::mount::{MountOptions, mount};
 pub use crate::owner::Owner;
-pub use crate::restore::{restore, RestoreOptions};
-pub use crate::show::{show_versions, ShowVersionsOptions};
+pub use crate::restore::{RestoreOptions, restore};
+pub use crate::show::{ShowVersionsOptions, show_versions};
 pub use crate::source::SourceTree;
 pub use crate::stats::DeleteStats;
 pub use crate::stored_tree::StoredTree;

src/monitor/test.rs

@@ -5,8 +5,8 @@
 use std::mem::take;
 use std::sync::{Arc, Mutex};
 
-use super::task::{Task, TaskList};
 use super::Monitor;
+use super::task::{Task, TaskList};
 use crate::counters::{Counter, Counters};
 use crate::{Apath, Error};