make fmt

Author: Byron

Diff for: git-diff/src/lines.rs

@@ -1,9 +1,8 @@
 use git_object::bstr::BStr;
-use similar::TextDiff;
-
 /// The crate powering file diffs.
 pub use similar;
 pub use similar::Algorithm;
+use similar::TextDiff;
 
 /// Provide an iterator over the changes needed to turn `old` into `new` with `algorithm`.
 ///

Diff for: git-mailmap/src/snapshot/entry.rs

@@ -1,6 +1,7 @@
-use crate::snapshot::util::{EncodedString, EncodedStringRef};
 use bstr::BString;
 
+use crate::snapshot::util::{EncodedString, EncodedStringRef};
+
 #[derive(Clone)]
 pub(crate) struct NameEntry {
     pub(crate) new_name: Option<BString>,

Diff for: git-mailmap/src/snapshot/signature.rs

@@ -1,6 +1,7 @@
-use bstr::{BStr, BString, ByteSlice};
 use std::borrow::Cow;
 
+use bstr::{BStr, BString, ByteSlice};
+
 /// A signature like [`git_actor::Signature`], but with all string fields being a `Cow`.
 #[derive(Default, PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]

Diff for: git-mailmap/src/snapshot/util.rs

@@ -1,6 +1,6 @@
+use std::{cmp::Ordering, ops::Deref};
+
 use bstr::{BStr, BString, ByteSlice};
-use std::cmp::Ordering;
-use std::ops::Deref;
 
 #[cfg_attr(test, derive(Debug))]
 #[derive(Clone)]

Diff for: git-pack/src/bundle/write/mod.rs

@@ -1,6 +1,6 @@
-use std::io::Write;
 use std::{
     io,
+    io::Write,
     path::{Path, PathBuf},
     sync::{atomic::AtomicBool, Arc},
 };
@@ -14,10 +14,11 @@ mod error;
 pub use error::Error;
 
 mod types;
-use crate::bundle::write::types::SharedTempFile;
 use types::{LockWriter, PassThrough};
 pub use types::{Options, Outcome};
 
+use crate::bundle::write::types::SharedTempFile;
+
 type ThinPackLookupFn = Box<dyn for<'a> FnMut(git_hash::ObjectId, &'a mut Vec<u8>) -> Option<git_object::Data<'a>>>;
 type ThinPackLookupFnSend =
     Box<dyn for<'a> FnMut(git_hash::ObjectId, &'a mut Vec<u8>) -> Option<git_object::Data<'a>> + Send + 'static>;

Diff for: git-ref/tests/file/worktree.rs

@@ -191,9 +191,9 @@ mod read_only {
 }
 
 mod writable {
-    use git_lock::acquire::Fail;
     use std::convert::TryInto;
 
+    use git_lock::acquire::Fail;
     use git_ref::{
         file::{transaction::PackedRefs, Store},
         transaction::{Change, LogChange, PreviousValue, RefEdit},

Diff for: git-refspec/tests/spec/mod.rs

@@ -1,6 +1,5 @@
 mod prefix {
-    use git_refspec::parse::Operation;
-    use git_refspec::RefSpec;
+    use git_refspec::{parse::Operation, RefSpec};
 
     #[test]
     fn partial_refs_have_no_prefix() {

Diff for: git-repository/src/config/cache/access.rs

@@ -1,9 +1,8 @@
-use crate::config::Cache;
-use crate::{remote, repository::identity};
+use std::{convert::TryInto, path::PathBuf, time::Duration};
+
 use git_lock::acquire::Fail;
-use std::convert::TryInto;
-use std::path::PathBuf;
-use std::time::Duration;
+
+use crate::{config::Cache, remote, repository::identity};
 
 /// Access
 impl Cache {

Diff for: git-repository/src/config/cache/util.rs

@@ -1,8 +1,7 @@
 use std::convert::TryFrom;
 
 use super::Error;
-use crate::bstr::ByteSlice;
-use crate::revision::spec::parse::ObjectKindHint;
+use crate::{bstr::ByteSlice, revision::spec::parse::ObjectKindHint};
 
 pub(crate) fn interpolate_context<'a>(
     git_install_dir: Option<&'a std::path::Path>,

Diff for: git-repository/src/config/snapshot/access.rs

@@ -1,10 +1,10 @@
-use git_features::threading::OwnShared;
 use std::borrow::Cow;
 
-use crate::config::{CommitAutoRollback, SnapshotMut};
+use git_features::threading::OwnShared;
+
 use crate::{
     bstr::BStr,
-    config::{cache::interpolate_context, Snapshot},
+    config::{cache::interpolate_context, CommitAutoRollback, Snapshot, SnapshotMut},
 };
 
 /// Access configuration values, frozen in time, using a `key` which is a `.` separated string of up to

Diff for: git-repository/src/object/tree/diff.rs

@@ -1,9 +1,13 @@
-use crate::bstr::{BStr, BString, ByteSlice, ByteVec};
-use crate::ext::ObjectIdExt;
-use crate::{Repository, Tree};
+use std::collections::VecDeque;
+
 use git_object::TreeRefIter;
 use git_odb::FindExt;
-use std::collections::VecDeque;
+
+use crate::{
+    bstr::{BStr, BString, ByteSlice, ByteVec},
+    ext::ObjectIdExt,
+    Repository, Tree,
+};
 
 /// The error return by methods on the [diff platform][Platform].
 #[derive(Debug, thiserror::Error)]
@@ -43,10 +47,10 @@ pub struct Change<'a, 'old, 'new> {
 
 ///
 pub mod change {
-    use crate::bstr::ByteSlice;
-    use crate::Id;
     use git_object::tree::EntryMode;
 
+    use crate::{bstr::ByteSlice, Id};
+
     /// An event emitted when finding differences between two trees.
     #[derive(Debug, Clone, Copy)]
     pub enum Event<'old, 'new> {

Diff for: git-repository/src/object/tree/traverse.rs

@@ -1,6 +1,7 @@
-use crate::Tree;
 use git_odb::FindExt;
 
+use crate::Tree;
+
 /// Traversal
 impl<'repo> Tree<'repo> {
     /// Obtain a platform for initiating a variety of traversals.

Diff for: git-repository/src/remote/connect.rs

@@ -1,6 +1,7 @@
-use crate::{remote::Connection, Progress, Remote};
 use git_protocol::transport::client::Transport;
 
+use crate::{remote::Connection, Progress, Remote};
+
 mod error {
     use crate::{bstr::BString, remote};
 

Diff for: git-repository/src/remote/connection/fetch/config.rs

@@ -1,6 +1,7 @@
+use std::convert::TryInto;
+
 use super::Error;
 use crate::Repository;
-use std::convert::TryInto;
 
 pub fn index_threads(repo: &Repository) -> Result<Option<usize>, Error> {
     let lenient_config = repo.options.lenient_config;

Diff for: git-repository/src/remote/connection/fetch/mod.rs

@@ -1,9 +1,17 @@
-use crate::remote::fetch::{DryRun, RefMap};
-use crate::remote::{fetch, ref_map, Connection};
-use crate::{remote, Progress};
+use std::sync::atomic::AtomicBool;
+
 use git_odb::FindExt;
 use git_protocol::transport::client::Transport;
-use std::sync::atomic::AtomicBool;
+
+use crate::{
+    remote,
+    remote::{
+        fetch,
+        fetch::{DryRun, RefMap},
+        ref_map, Connection,
+    },
+    Progress,
+};
 
 mod error {
     /// The error returned by [`receive()`](super::Prepare::receive()).

Diff for: git-repository/src/remote/connection/fetch/update_refs/mod.rs

@@ -1,14 +1,17 @@
-use crate::ext::ObjectIdExt;
-use crate::remote::fetch;
-use crate::remote::fetch::refs::update::Mode;
-use crate::Repository;
+use std::{collections::BTreeMap, convert::TryInto, path::PathBuf};
+
 use git_odb::FindExt;
 use git_pack::Find;
-use git_ref::transaction::{Change, LogChange, PreviousValue, RefEdit, RefLog};
-use git_ref::{Target, TargetRef};
-use std::collections::BTreeMap;
-use std::convert::TryInto;
-use std::path::PathBuf;
+use git_ref::{
+    transaction::{Change, LogChange, PreviousValue, RefEdit, RefLog},
+    Target, TargetRef,
+};
+
+use crate::{
+    ext::ObjectIdExt,
+    remote::{fetch, fetch::refs::update::Mode},
+    Repository,
+};
 
 ///
 pub mod update;

Diff for: git-repository/src/remote/connection/fetch/update_refs/tests.rs

@@ -1,7 +1,8 @@
 mod update {
-    use crate as git;
     use git_testtools::{hex_to_id, Result};
 
+    use crate as git;
+
     fn base_repo_path() -> String {
         git::path::realpath(
             git_testtools::scripted_fixture_repo_read_only("make_remote_repos.sh")
@@ -28,9 +29,9 @@ mod update {
         let repo = git::open_opts(dir.path().join(name), git::open::Options::isolated()).unwrap();
         (repo, dir)
     }
+    use git_ref::{transaction::Change, TargetRef};
+
     use crate::remote::fetch;
-    use git_ref::transaction::Change;
-    use git_ref::TargetRef;
 
     #[test]
     fn various_valid_updates() {

Diff for: git-repository/src/remote/connection/fetch/update_refs/update.rs

@@ -1,6 +1,7 @@
-use crate::remote::fetch;
 use std::path::PathBuf;
 
+use crate::remote::fetch;
+
 mod error {
     /// The error returned when updating references.
     #[derive(Debug, thiserror::Error)]

Diff for: git-repository/src/remote/connection/ref_map.rs

@@ -1,9 +1,12 @@
-use crate::bstr::{BString, ByteVec};
+use std::collections::HashSet;
+
 use git_features::progress::Progress;
 use git_protocol::transport::client::Transport;
-use std::collections::HashSet;
 
-use crate::remote::{connection::HandshakeWithRefs, fetch, Connection, Direction};
+use crate::{
+    bstr::{BString, ByteVec},
+    remote::{connection::HandshakeWithRefs, fetch, Connection, Direction},
+};
 
 /// The error returned by [`Connection::ref_map()`].
 #[derive(Debug, thiserror::Error)]

Diff for: git-repository/tests/object/tree.rs

@@ -1,10 +1,11 @@
 mod diff {
-    use crate::named_repo;
-    use git_object::bstr::ByteSlice;
-    use git_object::tree::EntryMode;
+    use std::convert::Infallible;
+
+    use git_object::{bstr::ByteSlice, tree::EntryMode};
     use git_repository as git;
     use git_repository::object::tree::diff::change::Event;
-    use std::convert::Infallible;
+
+    use crate::named_repo;
 
     #[test]
     fn changes_against_tree_modified() {

Diff for: git-repository/tests/remote/fetch.rs

@@ -1,12 +1,13 @@
 #[cfg(feature = "blocking-network-client")]
 mod blocking_io {
-    use crate::remote;
+    use std::sync::atomic::AtomicBool;
+
     use git_features::progress;
     use git_repository as git;
-    use git_repository::remote::fetch;
-    use git_repository::remote::Direction::Fetch;
+    use git_repository::remote::{fetch, Direction::Fetch};
     use git_testtools::hex_to_id;
-    use std::sync::atomic::AtomicBool;
+
+    use crate::remote;
 
     fn repo_rw(name: &str) -> (git::Repository, git_testtools::tempfile::TempDir) {
         let dir = git_testtools::scripted_fixture_repo_writable_with_args(

Diff for: git-repository/tests/repository/object.rs

@@ -147,10 +147,11 @@ mod tag {
 }
 
 mod commit {
-    use crate::{freeze_time, restricted_and_git};
     use git_repository as git;
     use git_testtools::hex_to_id;
 
+    use crate::{freeze_time, restricted_and_git};
+
     #[test]
     fn parent_in_initial_commit_causes_failure() {
         let tmp = tempfile::tempdir().unwrap();

Diff for: git-repository/tests/repository/remote.rs

@@ -273,9 +273,10 @@ mod find_remote {
 }
 
 mod find_default_remote {
-    use crate::remote;
     use git_repository as git;
 
+    use crate::remote;
+
     #[test]
     fn works_on_detached_heads() -> crate::Result {
         let repo = remote::repo("detached-head");

Diff for: git-transport/src/client/blocking_io/file.rs

@@ -1,6 +1,8 @@
-use std::any::Any;
-use std::error::Error;
-use std::process::{self, Command, Stdio};
+use std::{
+    any::Any,
+    error::Error,
+    process::{self, Command, Stdio},
+};
 
 use bstr::{BString, ByteSlice};
 

Diff for: git-transport/src/client/blocking_io/http/curl/mod.rs

@@ -1,5 +1,5 @@
-use std::error::Error;
 use std::{
+    error::Error,
     sync::mpsc::{Receiver, SyncSender},
     thread,
 };

Diff for: git-transport/src/client/blocking_io/http/mod.rs

@@ -1,5 +1,5 @@
-use std::any::Any;
 use std::{
+    any::Any,
     borrow::Cow,
     io::{BufRead, Read},
 };

Diff for: git-transport/src/client/git/async_io.rs

@@ -1,9 +1,10 @@
+use std::error::Error;
+
 use async_trait::async_trait;
 use bstr::BString;
 use futures_io::{AsyncRead, AsyncWrite};
 use futures_lite::AsyncWriteExt;
 use git_packetline::PacketLineRef;
-use std::error::Error;
 
 use crate::{
     client::{self, capabilities, git, Capabilities, SetServiceResponse},

Diff for: git-transport/src/client/git/blocking_io.rs

@@ -1,6 +1,4 @@
-use std::any::Any;
-use std::error::Error;
-use std::io::Write;
+use std::{any::Any, error::Error, io::Write};
 
 use bstr::BString;
 use git_packetline::PacketLineRef;

Diff for: git-transport/src/client/traits.rs

@@ -1,5 +1,7 @@
-use std::any::Any;
-use std::ops::{Deref, DerefMut};
+use std::{
+    any::Any,
+    ops::{Deref, DerefMut},
+};
 
 #[cfg(any(feature = "blocking-client", feature = "async-client"))]
 use crate::client::{MessageKind, RequestWriter, WriteMode};

Diff for: git-traverse/src/commit.rs

@@ -54,8 +54,11 @@ impl Default for Sorting {
 
 ///
 pub mod ancestors {
-    use std::borrow::Borrow;
-    use std::{borrow::BorrowMut, collections::VecDeque, iter::FromIterator};
+    use std::{
+        borrow::{Borrow, BorrowMut},
+        collections::VecDeque,
+        iter::FromIterator,
+    };
 
     use git_hash::{oid, ObjectId};
     use git_object::CommitRefIter;