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,
     };