j fmt

Author: Byron

gitoxide-core/src/lib.rs

@@ -30,9 +30,10 @@
 #![deny(rust_2018_idioms)]
 #![forbid(unsafe_code)]
 
-use anyhow::bail;
 use std::str::FromStr;
 
+use anyhow::bail;
+
 #[derive(Debug, Eq, PartialEq, Hash, Clone, Copy)]
 pub enum OutputFormat {
     Human,

gitoxide-core/src/organize.rs

@@ -1,5 +1,5 @@
-use std::borrow::Cow;
 use std::{
+    borrow::Cow,
     ffi::OsStr,
     path::{Path, PathBuf},
 };

gitoxide-core/src/pack/receive.rs

@@ -1,10 +1,10 @@
-use crate::net;
-use crate::pack::receive::protocol::fetch::negotiate;
-use crate::OutputFormat;
-use gix::config::tree::Key;
-use gix::protocol::maybe_async;
-use gix::remote::fetch::Error;
-use gix::DynNestedProgress;
+use std::{
+    io,
+    path::PathBuf,
+    sync::{atomic::AtomicBool, Arc},
+};
+
+use gix::{config::tree::Key, protocol::maybe_async, remote::fetch::Error, DynNestedProgress};
 pub use gix::{
     hash::ObjectId,
     objs::bstr::{BString, ByteSlice},
@@ -18,11 +18,8 @@ pub use gix::{
     },
     NestedProgress, Progress,
 };
-use std::{
-    io,
-    path::PathBuf,
-    sync::{atomic::AtomicBool, Arc},
-};
+
+use crate::{net, pack::receive::protocol::fetch::negotiate, OutputFormat};
 
 pub const PROGRESS_RANGE: std::ops::RangeInclusive<u8> = 1..=3;
 pub struct Context<W> {

gitoxide-core/src/repository/attributes/query.rs

@@ -8,10 +8,10 @@ pub struct Options {
 }
 
 pub(crate) mod function {
+    use std::{borrow::Cow, io, path::Path};
+
     use anyhow::bail;
     use gix::bstr::BStr;
-    use std::borrow::Cow;
-    use std::{io, path::Path};
 
     use crate::{
         is_dir_to_mode,

gitoxide-core/src/repository/blame.rs

@@ -1,7 +1,7 @@
-use gix::bstr::ByteSlice;
-use gix::config::tree;
 use std::ffi::OsStr;
 
+use gix::{bstr::ByteSlice, config::tree};
+
 pub fn blame_file(
     mut repo: gix::Repository,
     file: &OsStr,

gitoxide-core/src/repository/cat.rs

@@ -1,8 +1,7 @@
-use crate::repository::revision::resolve::{BlobFormat, TreeMode};
 use anyhow::{anyhow, Context};
-use gix::diff::blob::ResourceKind;
-use gix::filter::plumbing::driver::apply::Delay;
-use gix::revision::Spec;
+use gix::{diff::blob::ResourceKind, filter::plumbing::driver::apply::Delay, revision::Spec};
+
+use crate::repository::revision::resolve::{BlobFormat, TreeMode};
 
 pub fn display_object(
     repo: &gix::Repository,

gitoxide-core/src/repository/clean.rs

@@ -20,17 +20,23 @@ pub struct Options {
     pub find_untracked_repositories: FindRepository,
 }
 pub(crate) mod function {
-    use crate::repository::clean::{FindRepository, Options};
-    use crate::OutputFormat;
+    use std::{borrow::Cow, path::Path};
+
     use anyhow::bail;
-    use gix::bstr::BString;
-    use gix::bstr::ByteSlice;
-    use gix::dir::entry::{Kind, Status};
-    use gix::dir::walk::EmissionMode::CollapseDirectory;
-    use gix::dir::walk::ForDeletionMode::*;
-    use gix::dir::{walk, EntryRef};
-    use std::borrow::Cow;
-    use std::path::Path;
+    use gix::{
+        bstr::{BString, ByteSlice},
+        dir::{
+            entry::{Kind, Status},
+            walk,
+            walk::{EmissionMode::CollapseDirectory, ForDeletionMode::*},
+            EntryRef,
+        },
+    };
+
+    use crate::{
+        repository::clean::{FindRepository, Options},
+        OutputFormat,
+    };
 
     pub fn clean(
         repo: gix::Repository,

gitoxide-core/src/repository/diff.rs

@@ -1,12 +1,16 @@
 use anyhow::Context;
-use gix::bstr::{BString, ByteSlice};
-use gix::diff::blob::intern::TokenSource;
-use gix::diff::blob::unified_diff::{ContextSize, NewlineSeparator};
-use gix::diff::blob::UnifiedDiff;
-use gix::objs::tree::EntryMode;
-use gix::odb::store::RefreshMode;
-use gix::prelude::ObjectIdExt;
-use gix::ObjectId;
+use gix::{
+    bstr::{BString, ByteSlice},
+    diff::blob::{
+        intern::TokenSource,
+        unified_diff::{ContextSize, NewlineSeparator},
+        UnifiedDiff,
+    },
+    objs::tree::EntryMode,
+    odb::store::RefreshMode,
+    prelude::ObjectIdExt,
+    ObjectId,
+};
 
 pub fn tree(
     mut repo: gix::Repository,

gitoxide-core/src/repository/dirty.rs

@@ -1,6 +1,7 @@
-use crate::OutputFormat;
 use anyhow::bail;
 
+use crate::OutputFormat;
+
 pub enum Mode {
     IsClean,
     IsDirty,

gitoxide-core/src/repository/index/entries.rs

@@ -23,9 +23,9 @@ pub(crate) mod function {
         io::{BufWriter, Write},
     };
 
-    use gix::index::entry::Stage;
     use gix::{
         bstr::{BStr, BString},
+        index::entry::Stage,
         worktree::IndexPersistedOrInMemory,
         Repository,
     };

gitoxide-core/src/repository/mailmap.rs

@@ -1,7 +1,7 @@
-use anyhow::bail;
-use gix::bstr::{BString, ByteSlice};
 use std::io;
 
+use anyhow::bail;
+use gix::bstr::{BString, ByteSlice};
 #[cfg(feature = "serde")]
 use gix::mailmap::Entry;
 

gitoxide-core/src/repository/merge/commit.rs

@@ -1,11 +1,12 @@
-use crate::OutputFormat;
 use anyhow::{anyhow, bail, Context};
-use gix::bstr::BString;
-use gix::bstr::ByteSlice;
-use gix::merge::tree::TreatAsUnresolved;
-use gix::prelude::Write;
+use gix::{
+    bstr::{BString, ByteSlice},
+    merge::tree::TreatAsUnresolved,
+    prelude::Write,
+};
 
 use super::tree::Options;
+use crate::OutputFormat;
 
 #[allow(clippy::too_many_arguments)]
 pub fn commit(

gitoxide-core/src/repository/merge/file.rs

@@ -1,15 +1,19 @@
-use crate::OutputFormat;
-use anyhow::{anyhow, bail, Context};
-use gix::bstr::BString;
-use gix::bstr::ByteSlice;
-use gix::merge::blob::builtin_driver::binary;
-use gix::merge::blob::builtin_driver::text::Conflict;
-use gix::merge::blob::pipeline::WorktreeRoots;
-use gix::merge::blob::{Resolution, ResourceKind};
-use gix::object::tree::EntryKind;
-use gix::Id;
 use std::path::Path;
 
+use anyhow::{anyhow, bail, Context};
+use gix::{
+    bstr::{BString, ByteSlice},
+    merge::blob::{
+        builtin_driver::{binary, text::Conflict},
+        pipeline::WorktreeRoots,
+        Resolution, ResourceKind,
+    },
+    object::tree::EntryKind,
+    Id,
+};
+
+use crate::OutputFormat;
+
 pub fn file(
     repo: gix::Repository,
     out: &mut dyn std::io::Write,

gitoxide-core/src/repository/merge/tree.rs

@@ -10,14 +10,15 @@ pub struct Options {
 
 pub(super) mod function {
 
-    use crate::OutputFormat;
     use anyhow::{anyhow, bail, Context};
-    use gix::bstr::BString;
-    use gix::bstr::ByteSlice;
-    use gix::merge::tree::TreatAsUnresolved;
-    use gix::prelude::Write;
+    use gix::{
+        bstr::{BString, ByteSlice},
+        merge::tree::TreatAsUnresolved,
+        prelude::Write,
+    };
 
     use super::Options;
+    use crate::OutputFormat;
 
     #[allow(clippy::too_many_arguments)]
     pub fn tree(

gitoxide-core/src/repository/merge_base.rs

@@ -1,6 +1,7 @@
-use crate::OutputFormat;
 use anyhow::bail;
 
+use crate::OutputFormat;
+
 pub fn merge_base(
     mut repo: gix::Repository,
     first: String,

gitoxide-core/src/repository/odb.rs

@@ -1,5 +1,4 @@
-use std::io;
-use std::sync::atomic::Ordering;
+use std::{io, sync::atomic::Ordering};
 
 use anyhow::bail;
 

gitoxide-core/src/repository/revision/resolve.rs

@@ -28,9 +28,10 @@ pub(crate) mod function {
     use gix::revision::Spec;
 
     use super::Options;
-    use crate::repository::cat::display_object;
-    use crate::repository::revision::resolve::BlobFormat;
-    use crate::{repository::revision, OutputFormat};
+    use crate::{
+        repository::{cat::display_object, revision, revision::resolve::BlobFormat},
+        OutputFormat,
+    };
 
     pub fn resolve(
         mut repo: gix::Repository,

gitoxide-core/src/repository/status.rs

@@ -1,8 +1,11 @@
+use std::path::Path;
+
 use anyhow::bail;
-use gix::bstr::{BStr, BString, ByteSlice};
-use gix::status::{self, index_worktree};
+use gix::{
+    bstr::{BStr, BString, ByteSlice},
+    status::{self, index_worktree},
+};
 use gix_status::index_as_worktree::{Change, Conflict, EntryStatus};
-use std::path::Path;
 
 use crate::OutputFormat;
 

gitoxide-core/src/repository/tree.rs

@@ -1,17 +1,18 @@
+use std::{borrow::Cow, io, io::BufWriter};
+
 use anyhow::bail;
 use gix::Tree;
-use std::io::BufWriter;
-use std::{borrow::Cow, io};
 
 use crate::OutputFormat;
 
 mod entries {
+    use std::collections::VecDeque;
+
     use gix::{
         bstr::{BStr, BString, ByteSlice, ByteVec},
         objs::tree::EntryRef,
         traverse::tree::visit::Action,
     };
-    use std::collections::VecDeque;
 
     use crate::repository::tree::format_entry;
 

gitoxide-core/src/repository/worktree.rs

@@ -1,6 +1,7 @@
-use crate::OutputFormat;
 use anyhow::bail;
 
+use crate::OutputFormat;
+
 pub fn list(repo: gix::Repository, out: &mut dyn std::io::Write, format: OutputFormat) -> anyhow::Result<()> {
     if format != OutputFormat::Human {
         bail!("JSON output isn't implemented yet");

gix-actor/src/signature/decode.rs

@@ -1,16 +1,15 @@
 pub(crate) mod function {
-    use crate::{IdentityRef, SignatureRef};
     use bstr::ByteSlice;
-    use winnow::error::ErrMode;
-    use winnow::stream::Stream;
     use winnow::{
         combinator::{opt, separated_pair},
-        error::{AddContext, ParserError, StrContext},
+        error::{AddContext, ErrMode, ParserError, StrContext},
         prelude::*,
-        stream::AsChar,
+        stream::{AsChar, Stream},
         token::take_while,
     };
 
+    use crate::{IdentityRef, SignatureRef};
+
     /// Parse a signature from the bytes input `i` using `nom`.
     pub fn decode<'a, E: ParserError<&'a [u8]> + AddContext<&'a [u8], StrContext>>(
         i: &mut &'a [u8],
@@ -85,10 +84,11 @@ pub use function::identity;
 #[cfg(test)]
 mod tests {
     mod parse_signature {
-        use crate::{signature, SignatureRef};
         use gix_testtools::to_bstr_err;
         use winnow::prelude::*;
 
+        use crate::{signature, SignatureRef};
+
         fn decode<'i>(
             i: &mut &'i [u8],
         ) -> ModalResult<SignatureRef<'i>, winnow::error::TreeError<&'i [u8], winnow::error::StrContext>> {

gix-actor/src/signature/mod.rs

@@ -65,9 +65,10 @@ mod _ref {
 }
 
 mod convert {
-    use crate::{Signature, SignatureRef};
     use gix_date::parse::TimeBuf;
 
+    use crate::{Signature, SignatureRef};
+
     impl Signature {
         /// Borrow this instance as immutable, serializing the `time` field into `buf`.
         pub fn to_ref<'a>(&'a self, time_buf: &'a mut TimeBuf) -> SignatureRef<'a> {
@@ -91,10 +92,11 @@ mod convert {
 }
 
 pub(crate) mod write {
-    use crate::{Signature, SignatureRef};
     use bstr::{BStr, ByteSlice};
     use gix_date::parse::TimeBuf;
 
+    use crate::{Signature, SignatureRef};
+
     /// The Error produced by [`Signature::write_to()`].
     #[derive(Debug, thiserror::Error)]
     #[allow(missing_docs)]

gix-attributes/src/name.rs

@@ -1,7 +1,8 @@
-use crate::{Name, NameRef};
 use bstr::{BStr, BString, ByteSlice};
 use kstring::KStringRef;
 
+use crate::{Name, NameRef};
+
 impl NameRef<'_> {
     /// Turn this ref into its owned counterpart.
     pub fn to_owned(self) -> Name {