make fmt

git-discover/src/upwards/types.rs

@@ -1,5 +1,4 @@
-use std::ffi::OsStr;
-use std::{env, path::PathBuf};
+use std::{env, ffi::OsStr, path::PathBuf};
 
 /// The error returned by [git_discover::upwards()][crate::upwards()].
 #[derive(Debug, thiserror::Error)]

git-features/src/progress.rs

@@ -3,8 +3,7 @@ use std::io;
 
 pub use prodash::{
     messages::MessageLevel,
-    progress::Id,
-    progress::{Discard, DoOrDiscard, Either, Step, StepShared, ThroughputOnDrop, UNKNOWN},
+    progress::{Discard, DoOrDiscard, Either, Id, Step, StepShared, ThroughputOnDrop, UNKNOWN},
     unit, Progress, Unit,
 };
 

git-index/src/access/mod.rs

@@ -1,6 +1,7 @@
-use bstr::{BStr, ByteSlice, ByteVec};
 use std::cmp::Ordering;
 
+use bstr::{BStr, ByteSlice, ByteVec};
+
 use crate::{entry, extension, Entry, PathStorage, State, Version};
 
 // TODO: integrate this somehow, somewhere, depending on later usage.

git-index/src/entry/mod.rs

@@ -64,14 +64,11 @@ mod access {
 }
 
 mod _impls {
-    use std::cmp::Ordering;
-    use std::ops::Add;
-    use std::time::SystemTime;
+    use std::{cmp::Ordering, ops::Add, time::SystemTime};
 
     use bstr::BStr;
 
-    use crate::entry::Time;
-    use crate::{Entry, State};
+    use crate::{entry::Time, Entry, State};
 
     impl From<SystemTime> for Time {
         fn from(s: SystemTime) -> Self {

git-index/src/file/mod.rs

@@ -19,9 +19,10 @@ mod impls {
 }
 
 mod impl_ {
-    use crate::{File, State};
     use std::fmt::Formatter;
 
+    use crate::{File, State};
+
     impl std::fmt::Debug for File {
         fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
             f.debug_struct("File")
@@ -66,9 +67,10 @@ mod access {
 }
 
 mod mutation {
-    use crate::File;
     use std::path::PathBuf;
 
+    use crate::File;
+
     /// Mutating access
     impl File {
         /// Set the path at which we think we are located to the given `path`.

git-index/src/lib.rs

@@ -9,7 +9,6 @@
 use std::{ops::Range, path::PathBuf};
 
 use filetime::FileTime;
-
 pub use git_hash as hash;
 
 ///
@@ -110,9 +109,10 @@ pub struct State {
 }
 
 mod impls {
-    use crate::State;
     use std::fmt::{Debug, Formatter};
 
+    use crate::State;
+
     impl Debug for State {
         fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
             for entry in &self.entries {

git-index/tests/index/entry.rs

@@ -1,7 +1,8 @@
 mod time {
-    use git_index::entry;
     use std::time::SystemTime;
 
+    use git_index::entry;
+
     #[test]
     fn conversion_roundtrip() {
         for sample in [entry::Time::default(), entry::Time { secs: 42, nsecs: 150 }] {

git-index/tests/index/file/read.rs

@@ -1,13 +1,12 @@
 use std::path::{Path, PathBuf};
 
-use crate::hex_to_id;
 use bstr::ByteSlice;
 use git_index::{
     entry::{self, Flags, Mode},
     Version,
 };
 
-use crate::loose_file_path;
+use crate::{hex_to_id, loose_file_path};
 
 fn verify(index: git_index::File) -> git_index::File {
     index.verify_integrity().unwrap();

git-index/tests/index/mod.rs

@@ -1,6 +1,7 @@
-use git_hash::ObjectId;
 use std::path::{Path, PathBuf};
 
+use git_hash::ObjectId;
+
 mod access;
 mod entry;
 mod file;

git-odb/src/store_impls/dynamic/verify.rs

@@ -14,8 +14,7 @@ use crate::{
 
 ///
 pub mod integrity {
-    use std::marker::PhantomData;
-    use std::path::PathBuf;
+    use std::{marker::PhantomData, path::PathBuf};
 
     use crate::pack;
 

git-odb/tests/odb/store/dynamic.rs

@@ -4,8 +4,7 @@ use git_hash::ObjectId;
 use git_odb::{store, store::iter::Ordering, Find, FindExt, Header, Write};
 use git_testtools::fixture_path;
 
-use crate::hex_to_id;
-use crate::odb::db;
+use crate::{hex_to_id, odb::db};
 
 fn all_orderings() -> [Ordering; 2] {
     [

git-odb/tests/odb/store/loose.rs

@@ -90,8 +90,7 @@ mod lookup_prefix {
     use git_testtools::fixture_path;
     use maplit::hashset;
 
-    use crate::odb::hex_to_id;
-    use crate::store::loose::ldb;
+    use crate::{odb::hex_to_id, store::loose::ldb};
 
     #[test]
     fn returns_none_for_prefixes_without_any_match() {
@@ -330,8 +329,7 @@ cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB
     }
 
     mod header {
-        use crate::odb::hex_to_id;
-        use crate::odb::store::loose::ldb;
+        use crate::odb::{hex_to_id, store::loose::ldb};
 
         #[test]
         fn existing() -> crate::Result {

git-pack/src/bundle/write/mod.rs

@@ -1,7 +1,7 @@
-use std::marker::PhantomData;
 use std::{
     io,
     io::Write,
+    marker::PhantomData,
     path::{Path, PathBuf},
     sync::{atomic::AtomicBool, Arc},
 };

git-pack/src/index/traverse/types.rs

@@ -1,5 +1,4 @@
-use std::collections::BTreeMap;
-use std::marker::PhantomData;
+use std::{collections::BTreeMap, marker::PhantomData};
 
 /// Statistics regarding object encountered during execution of the [`traverse()`][crate::index::File::traverse()] method.
 #[derive(Debug, PartialEq, Eq, Hash, Ord, PartialOrd, Clone)]

git-pack/src/index/traverse/with_lookup.rs

@@ -3,13 +3,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use git_features::{
     parallel::{self, in_parallel_if},
     progress::{self, unit, Progress},
+    threading::{lock, Mutable, OwnShared},
 };
 
 use super::{Error, Reducer};
-use crate::{data, index, index::util};
-
-use crate::index::traverse::Outcome;
-use git_features::threading::{lock, Mutable, OwnShared};
+use crate::{
+    data, index,
+    index::{traverse::Outcome, util},
+};
 
 /// Traversal options for [`index::File::traverse_with_lookup()`]
 pub struct Options<F> {

git-pack/src/index/verify.rs

@@ -7,9 +7,10 @@ use crate::index;
 
 ///
 pub mod integrity {
-    use git_object::bstr::BString;
     use std::marker::PhantomData;
 
+    use git_object::bstr::BString;
+
     /// Returned by [`index::File::verify_integrity()`][crate::index::File::verify_integrity()].
     #[derive(thiserror::Error, Debug)]
     #[allow(missing_docs)]

git-pack/tests/pack/data/file.rs

@@ -9,10 +9,12 @@ fn pack_at(at: &str) -> pack::data::File {
 mod method {
     use std::sync::atomic::AtomicBool;
 
-    use crate::hex_to_id;
     use git_features::progress;
 
-    use crate::pack::{data::file::pack_at, SMALL_PACK};
+    use crate::{
+        hex_to_id,
+        pack::{data::file::pack_at, SMALL_PACK},
+    };
 
     #[test]
     fn checksum() {

git-pack/tests/pack/multi_index/access.rs

@@ -1,8 +1,7 @@
 use std::path::PathBuf;
 
-use crate::hex_to_id;
-
 use super::multi_index;
+use crate::hex_to_id;
 
 #[test]
 fn lookup_with_ambiguity() {

git-pack/tests/pack/multi_index/write.rs

@@ -1,9 +1,10 @@
 use std::{path::PathBuf, sync::atomic::AtomicBool};
 
-use crate::hex_to_id;
 use git_features::progress;
 use git_testtools::fixture_path_standalone;
 
+use crate::hex_to_id;
+
 #[test]
 fn from_paths() -> crate::Result {
     let dir = tempfile::TempDir::new()?;

git-ref/tests/file/reference.rs

@@ -47,11 +47,10 @@ mod reflog {
 }
 
 mod peel {
-    use crate::util::hex_to_id;
     use git_odb::pack::Find;
     use git_ref::{file::ReferenceExt, peel, Reference};
 
-    use crate::{file, file::store_with_packed_refs};
+    use crate::{file, file::store_with_packed_refs, util::hex_to_id};
 
     #[test]
     fn one_level() -> crate::Result {
@@ -180,10 +179,11 @@ mod parse {
         mktest!(ref_tag, b"reff: hello", "\"reff: hello\" could not be parsed");
     }
     mod valid {
-        use crate::util::hex_to_id;
         use git_object::bstr::ByteSlice;
         use git_ref::file::loose::Reference;
 
+        use crate::util::hex_to_id;
+
         macro_rules! mktest {
             ($name:ident, $input:literal, $kind:path, $id:expr, $ref:expr) => {
                 #[test]

git-ref/tests/file/store/find.rs

@@ -3,8 +3,7 @@ mod existing {
 
     use git_ref::{PartialName, PartialNameRef};
 
-    use crate::file::store_at;
-    use crate::util::hex_to_id;
+    use crate::{file::store_at, util::hex_to_id};
 
     #[test]
     fn with_packed_refs() -> crate::Result {

git-ref/tests/file/store/iter.rs

@@ -2,8 +2,10 @@ use std::convert::TryInto;
 
 use git_object::bstr::ByteSlice;
 
-use crate::file::{store, store_at, store_with_packed_refs};
-use crate::util::hex_to_id;
+use crate::{
+    file::{store, store_at, store_with_packed_refs},
+    util::hex_to_id,
+};
 
 mod with_namespace {
     use git_object::bstr::{BString, ByteSlice};

git-ref/tests/file/transaction/prepare_and_commit/delete.rs

@@ -1,16 +1,18 @@
 use std::convert::TryInto;
 
-use crate::util::hex_to_id;
 use git_lock::acquire::Fail;
 use git_ref::{
     file::ReferenceExt,
     transaction::{Change, PreviousValue, RefEdit, RefLog},
     Reference, Target,
 };
 
-use crate::file::{
-    store_writable,
-    transaction::prepare_and_commit::{committer, empty_store},
+use crate::{
+    file::{
+        store_writable,
+        transaction::prepare_and_commit::{committer, empty_store},
+    },
+    util::hex_to_id,
 };
 
 #[test]

git-ref/tests/file/worktree.rs

@@ -193,17 +193,19 @@ mod read_only {
 mod writable {
     use std::convert::TryInto;
 
-    use crate::util::hex_to_id;
     use git_lock::acquire::Fail;
     use git_ref::{
         file::{transaction::PackedRefs, Store},
         transaction::{Change, LogChange, PreviousValue, RefEdit},
         FullName, FullNameRef, Target,
     };
 
-    use crate::file::{
-        transaction::prepare_and_commit::committer,
-        worktree::{main_store, worktree_store, Mode},
+    use crate::{
+        file::{
+            transaction::prepare_and_commit::committer,
+            worktree::{main_store, worktree_store, Mode},
+        },
+        util::hex_to_id,
     };
 
     fn change_with_id(id: git_hash::ObjectId) -> Change {

git-ref/tests/transaction/mod.rs

@@ -98,13 +98,12 @@ mod refedit_ext {
     mod splitting {
         use std::{cell::Cell, convert::TryInto};
 
-        use crate::util::hex_to_id;
         use git_ref::{
             transaction::{Change, LogChange, PreviousValue, RefEdit, RefEditsExt, RefLog},
             FullNameRef, PartialNameRef, Target,
         };
 
-        use crate::transaction::refedit_ext::MockStore;
+        use crate::{transaction::refedit_ext::MockStore, util::hex_to_id};
 
         fn find<'a>(edits: &'a [RefEdit], name: &str) -> &'a RefEdit {
             let name: &FullNameRef = name.try_into().unwrap();

git-repository/src/config/cache/access.rs

@@ -2,12 +2,15 @@ use std::{borrow::Cow, path::PathBuf, time::Duration};
 
 use git_lock::acquire::Fail;
 
-use crate::config::cache::util::ApplyLeniency;
-use crate::config::tree::{Checkout, Core, Key};
 use crate::{
     bstr::BStr,
     config,
-    config::{cache::util::ApplyLeniencyDefault, checkout_options, Cache},
+    config::{
+        cache::util::{ApplyLeniency, ApplyLeniencyDefault},
+        checkout_options,
+        tree::{Checkout, Core, Key},
+        Cache,
+    },
     remote,
     repository::identity,
 };

git-repository/src/config/cache/init.rs

@@ -3,11 +3,14 @@ use std::borrow::Cow;
 use git_sec::Permission;
 
 use super::{interpolate_context, util, Error, StageOne};
-use crate::config::tree::{gitoxide, Core, Http};
 use crate::{
     bstr::BString,
     config,
-    config::{cache::util::ApplyLeniency, Cache},
+    config::{
+        cache::util::ApplyLeniency,
+        tree::{gitoxide, Core, Http},
+        Cache,
+    },
     repository,
 };