just fmt

Byron · Byron · commit 871dd0b977ca · 2023-06-22T09:40:04.000+02:00
diff --git a/gitoxide-core/src/commitgraph/verify.rs b/gitoxide-core/src/commitgraph/verify.rs
@@ -20,10 +20,12 @@ impl Default for Context<Vec<u8>, Vec<u8>> {
 }
 
 pub(crate) mod function {
-    use crate::OutputFormat;
+    use std::{io, path::Path};
+
     use anyhow::{Context as AnyhowContext, Result};
     use gix::commitgraph::{verify::Outcome, Graph};
-    use std::{io, path::Path};
+
+    use crate::OutputFormat;
 
     pub fn verify<W1, W2>(
         path: impl AsRef<Path>,
diff --git a/gitoxide-core/src/corpus/db.rs b/gitoxide-core/src/corpus/db.rs
@@ -1,10 +1,12 @@
-use crate::corpus::{Engine, Run};
+use std::path::{Path, PathBuf};
+
 use anyhow::{bail, Context};
 use bytesize::ByteSize;
 use rusqlite::{params, OptionalExtension};
-use std::path::{Path, PathBuf};
 use sysinfo::{CpuExt, CpuRefreshKind, RefreshKind, SystemExt};
 
+use crate::corpus::{Engine, Run};
+
 pub(crate) type Id = u32;
 
 /// a husk of a repository
diff --git a/gitoxide-core/src/corpus/engine.rs b/gitoxide-core/src/corpus/engine.rs
@@ -1,14 +1,20 @@
-use super::db;
-use crate::corpus;
-use crate::corpus::{Engine, Task};
-use crate::organize::find_git_repository_workdirs;
+use std::{
+    path::{Path, PathBuf},
+    sync::atomic::Ordering,
+    time::{Duration, Instant},
+};
+
 use anyhow::{bail, Context};
 use bytesize::ByteSize;
 use gix::Progress;
 use rusqlite::params;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::Ordering;
-use std::time::{Duration, Instant};
+
+use super::db;
+use crate::{
+    corpus,
+    corpus::{Engine, Task},
+    organize::find_git_repository_workdirs,
+};
 
 pub type ProgressItem = gix::progress::DoOrDiscard<gix::progress::prodash::tree::Item>;
 
diff --git a/gitoxide-core/src/corpus/run.rs b/gitoxide-core/src/corpus/run.rs
@@ -1,8 +1,10 @@
-use crate::corpus;
-use crate::corpus::{Run, Task};
-use crate::pack::verify::Algorithm;
-use std::path::Path;
-use std::sync::atomic::AtomicBool;
+use std::{path::Path, sync::atomic::AtomicBool};
+
+use crate::{
+    corpus,
+    corpus::{Run, Task},
+    pack::verify::Algorithm,
+};
 
 impl Task {
     pub fn perform(
diff --git a/gitoxide-core/src/corpus/trace.rs b/gitoxide-core/src/corpus/trace.rs
@@ -1,9 +1,14 @@
+use std::{
+    path::Path,
+    sync::{
+        atomic::{AtomicU32, Ordering},
+        Arc,
+    },
+};
+
 use gix::progress::DoOrDiscard;
 use parking_lot::Mutex;
 use rusqlite::params;
-use std::path::Path;
-use std::sync::atomic::{AtomicU32, Ordering};
-use std::sync::Arc;
 use tracing_forest::tree::Tree;
 use tracing_subscriber::layer::SubscriberExt;
 
diff --git a/gitoxide-core/src/hours/core.rs b/gitoxide-core/src/hours/core.rs
@@ -1,14 +1,19 @@
-use std::collections::{hash_map::Entry, HashMap};
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::Arc;
+use std::{
+    collections::{hash_map::Entry, HashMap},
+    sync::{
+        atomic::{AtomicUsize, Ordering},
+        Arc,
+    },
+};
 
-use gix::bstr::BStr;
-use gix::odb::FindExt;
+use gix::{bstr::BStr, odb::FindExt};
 use itertools::Itertools;
 use smallvec::SmallVec;
 
-use crate::hours::util::{add_lines, remove_lines};
-use crate::hours::{CommitIdx, FileStats, LineStats, WorkByEmail, WorkByPerson};
+use crate::hours::{
+    util::{add_lines, remove_lines},
+    CommitIdx, FileStats, LineStats, WorkByEmail, WorkByPerson,
+};
 
 const MINUTES_PER_HOUR: f32 = 60.0;
 pub const HOURS_PER_WORKDAY: f32 = 8.0;
diff --git a/gitoxide-core/src/hours/mod.rs b/gitoxide-core/src/hours/mod.rs
@@ -333,5 +333,6 @@ mod core;
 use self::core::{deduplicate_identities, estimate_hours, HOURS_PER_WORKDAY};
 
 mod util;
-use crate::hours::core::spawn_tree_delta_threads;
 use util::{CommitIdx, FileStats, LineStats, WorkByEmail, WorkByPerson};
+
+use crate::hours::core::spawn_tree_delta_threads;
diff --git a/gitoxide-core/src/repository/attributes/query.rs b/gitoxide-core/src/repository/attributes/query.rs
@@ -6,8 +6,7 @@ pub struct Options {
 }
 
 pub(crate) mod function {
-    use std::io;
-    use std::path::Path;
+    use std::{io, path::Path};
 
     use anyhow::bail;
     use gix::prelude::FindExt;
diff --git a/gitoxide-core/src/repository/commitgraph/list.rs b/gitoxide-core/src/repository/commitgraph/list.rs
@@ -1,10 +1,8 @@
 pub(crate) mod function {
-    use std::borrow::Cow;
-    use std::ffi::OsString;
+    use std::{borrow::Cow, ffi::OsString};
 
     use anyhow::{bail, Context};
-    use gix::prelude::ObjectIdExt;
-    use gix::traverse::commit::Sorting;
+    use gix::{prelude::ObjectIdExt, traverse::commit::Sorting};
 
     use crate::OutputFormat;
 
diff --git a/gitoxide-core/src/repository/commitgraph/verify.rs b/gitoxide-core/src/repository/commitgraph/verify.rs
@@ -12,10 +12,10 @@ pub struct Context<W1: std::io::Write, W2: std::io::Write> {
 pub(crate) mod function {
     use std::io;
 
-    use crate::repository::commitgraph::verify::Context;
-    use crate::OutputFormat;
     use anyhow::{Context as AnyhowContext, Result};
 
+    use crate::{repository::commitgraph::verify::Context, OutputFormat};
+
     pub fn verify<W1, W2>(
         repo: gix::Repository,
         Context {
diff --git a/gitoxide-core/src/repository/fetch.rs b/gitoxide-core/src/repository/fetch.rs
@@ -19,11 +19,11 @@ pub const PROGRESS_RANGE: std::ops::RangeInclusive<u8> = 1..=3;
 pub(crate) mod function {
     use anyhow::bail;
     use gix::{prelude::ObjectIdExt, refspec::match_group::validate::Fix, remote::fetch::Status};
-    use layout::backends::svg::SVGWriter;
-    use layout::core::base::Orientation;
-    use layout::core::geometry::Point;
-    use layout::core::style::StyleAttr;
-    use layout::std_shapes::shapes::{Arrow, Element, ShapeKind};
+    use layout::{
+        backends::svg::SVGWriter,
+        core::{base::Orientation, geometry::Point, style::StyleAttr},
+        std_shapes::shapes::{Arrow, Element, ShapeKind},
+    };
 
     use super::Options;
     use crate::OutputFormat;
diff --git a/gitoxide-core/src/repository/revision/list.rs b/gitoxide-core/src/repository/revision/list.rs
@@ -1,6 +1,6 @@
+use std::{ffi::OsString, path::PathBuf};
+
 use crate::OutputFormat;
-use std::ffi::OsString;
-use std::path::PathBuf;
 
 pub struct Context {
     pub limit: Option<usize>,
@@ -17,18 +17,14 @@ pub const PROGRESS_RANGE: std::ops::RangeInclusive<u8> = 0..=2;
 
 pub(crate) mod function {
     use anyhow::{bail, Context};
-    use gix::hashtable::HashMap;
-    use gix::traverse::commit::Sorting;
-
-    use gix::Progress;
-    use layout::backends::svg::SVGWriter;
-    use layout::core::base::Orientation;
-    use layout::core::geometry::Point;
-    use layout::core::style::StyleAttr;
-    use layout::std_shapes::shapes::{Arrow, Element, ShapeKind};
+    use gix::{hashtable::HashMap, traverse::commit::Sorting, Progress};
+    use layout::{
+        backends::svg::SVGWriter,
+        core::{base::Orientation, geometry::Point, style::StyleAttr},
+        std_shapes::shapes::{Arrow, Element, ShapeKind},
+    };
 
-    use crate::repository::revision::list::Format;
-    use crate::OutputFormat;
+    use crate::{repository::revision::list::Format, OutputFormat};
 
     pub fn list(
         mut repo: gix::Repository,
diff --git a/gix-actor/src/signature/decode.rs b/gix-actor/src/signature/decode.rs
@@ -1,8 +1,7 @@
 pub(crate) mod function {
     use bstr::ByteSlice;
     use btoi::btoi;
-    use gix_date::time::Sign;
-    use gix_date::{OffsetInSeconds, SecondsSinceUnixEpoch, Time};
+    use gix_date::{time::Sign, OffsetInSeconds, SecondsSinceUnixEpoch, Time};
     use nom::{
         branch::alt,
         bytes::complete::{tag, take, take_until, take_while_m_n},
@@ -95,8 +94,7 @@ pub use function::identity;
 mod tests {
     mod parse_signature {
         use bstr::ByteSlice;
-        use gix_date::time::Sign;
-        use gix_date::{OffsetInSeconds, SecondsSinceUnixEpoch};
+        use gix_date::{time::Sign, OffsetInSeconds, SecondsSinceUnixEpoch};
         use gix_testtools::to_bstr_err;
         use nom::IResult;
 
diff --git a/gix-actor/tests/signature/mod.rs b/gix-actor/tests/signature/mod.rs
@@ -1,8 +1,7 @@
 mod write_to {
     mod invalid {
         use gix_actor::Signature;
-        use gix_date::time::Sign;
-        use gix_date::Time;
+        use gix_date::{time::Sign, Time};
 
         #[test]
         fn name() {
diff --git a/gix-date/tests/time/baseline.rs b/gix-date/tests/time/baseline.rs
@@ -1,7 +1,9 @@
 use std::{collections::HashMap, time::SystemTime};
 
-use gix_date::time::{format, Format};
-use gix_date::SecondsSinceUnixEpoch;
+use gix_date::{
+    time::{format, Format},
+    SecondsSinceUnixEpoch,
+};
 use once_cell::sync::Lazy;
 
 type Result<T = ()> = std::result::Result<T, Box<dyn std::error::Error>>;
diff --git a/gix-object/tests/commit/from_bytes.rs b/gix-object/tests/commit/from_bytes.rs
@@ -1,6 +1,5 @@
 use gix_actor::SignatureRef;
-use gix_date::time::Sign;
-use gix_date::Time;
+use gix_date::{time::Sign, Time};
 use gix_object::{bstr::ByteSlice, commit::message::body::TrailerRef, CommitRef};
 use smallvec::SmallVec;
 
diff --git a/gix-object/tests/commit/message.rs b/gix-object/tests/commit/message.rs
@@ -224,8 +224,7 @@ mod summary {
     use std::borrow::Cow;
 
     use gix_actor::SignatureRef;
-    use gix_date::time::Sign;
-    use gix_date::Time;
+    use gix_date::{time::Sign, Time};
     use gix_object::{
         bstr::{BStr, ByteSlice},
         commit::MessageRef,
diff --git a/gix-odb/src/cache.rs b/gix-odb/src/cache.rs
@@ -133,8 +133,7 @@ impl<S> DerefMut for Cache<S> {
 }
 
 mod impls {
-    use std::cell::RefCell;
-    use std::{io::Read, ops::DerefMut};
+    use std::{cell::RefCell, io::Read, ops::DerefMut};
 
     use gix_hash::{oid, ObjectId};
     use gix_object::{Data, Kind};
diff --git a/gix-revision/src/lib.rs b/gix-revision/src/lib.rs
@@ -14,6 +14,5 @@ pub use describe::function::describe;
 
 ///
 pub mod spec;
-pub use spec::types::Spec;
-
 pub use gix_revwalk::{graph, Graph, PriorityQueue};
+pub use spec::types::Spec;
diff --git a/gix-trace/src/enabled.rs b/gix-trace/src/enabled.rs
@@ -1,5 +1,4 @@
 use tracing_core::{dispatcher::get_default as with_dispatcher, span, span::Id, Dispatch};
-
 // these are used later in macros.
 pub use tracing_core::{field, metadata, Metadata};
 
diff --git a/gix-traverse/src/commit.rs b/gix-traverse/src/commit.rs
@@ -87,16 +87,16 @@ pub struct Info {
 
 ///
 pub mod ancestors {
-    use gix_date::SecondsSinceUnixEpoch;
-    use smallvec::SmallVec;
     use std::{
         borrow::{Borrow, BorrowMut},
         collections::VecDeque,
     };
 
+    use gix_date::SecondsSinceUnixEpoch;
     use gix_hash::{oid, ObjectId};
     use gix_hashtable::HashSet;
     use gix_object::CommitRefIter;
+    use smallvec::SmallVec;
 
     use crate::commit::{collect_parents, Ancestors, Either, Info, ParentIds, Parents, Sorting};
 
diff --git a/gix-traverse/tests/commit/mod.rs b/gix-traverse/tests/commit/mod.rs
@@ -101,9 +101,10 @@ mod ancestor {
     }
 
     mod different_date_intermixed {
-        use crate::commit::ancestor::TraversalAssertion;
         use gix_traverse::commit::Sorting;
 
+        use crate::commit::ancestor::TraversalAssertion;
+
         #[test]
         fn head_breadth_first() -> crate::Result {
             TraversalAssertion::new_at(
@@ -148,9 +149,10 @@ mod ancestor {
     }
 
     mod different_date {
-        use crate::commit::ancestor::TraversalAssertion;
         use gix_traverse::commit::Sorting;
 
+        use crate::commit::ancestor::TraversalAssertion;
+
         #[test]
         fn head_breadth_first() -> crate::Result {
             TraversalAssertion::new_at(
@@ -200,10 +202,10 @@ mod ancestor {
 
     /// Same dates are somewhat special as they show how sorting-details on priority queues affects ordering
     mod same_date {
-        use crate::commit::ancestor::TraversalAssertion;
-        use crate::hex_to_id;
         use gix_traverse::commit::{Parents, Sorting};
 
+        use crate::{commit::ancestor::TraversalAssertion, hex_to_id};
+
         #[test]
         fn c4_breadth_first() -> crate::Result {
             TraversalAssertion::new(
@@ -344,11 +346,11 @@ mod ancestor {
 
     /// Some dates adjusted to be a year apart, but still 'c1' and 'c2' with the same date.
     mod adjusted_dates {
-        use crate::commit::ancestor::TraversalAssertion;
-        use crate::hex_to_id;
         use gix_odb::FindExt;
         use gix_traverse::commit::{ancestors, Ancestors, Parents, Sorting};
 
+        use crate::{commit::ancestor::TraversalAssertion, hex_to_id};
+
         #[test]
         fn head_breadth_first() -> crate::Result {
             TraversalAssertion::new(
diff --git a/gix/examples/stats.rs b/gix/examples/stats.rs
@@ -1,7 +1,7 @@
-use gix::prelude::ObjectIdExt;
-use gix::Reference;
 use std::io::Write;
 
+use gix::{prelude::ObjectIdExt, Reference};
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut repo = gix::discover(".")?;
     println!("Repo: {}", repo.work_dir().unwrap_or_else(|| repo.git_dir()).display());
diff --git a/gix/src/config/cache/access.rs b/gix/src/config/cache/access.rs
@@ -4,12 +4,11 @@ use std::{borrow::Cow, path::PathBuf, time::Duration};
 use gix_attributes::Source;
 use gix_lock::acquire::Fail;
 
-use crate::config::cache::util::ApplyLeniencyDefaultValue;
 use crate::{
     bstr::BStr,
     config,
     config::{
-        cache::util::{ApplyLeniency, ApplyLeniencyDefault},
+        cache::util::{ApplyLeniency, ApplyLeniencyDefault, ApplyLeniencyDefaultValue},
         checkout_options,
         tree::{gitoxide, Checkout, Core, Key},
         Cache,
diff --git a/gix/src/config/snapshot/access.rs b/gix/src/config/snapshot/access.rs
diff --git a/gix/src/remote/connection/fetch/negotiate.rs b/gix/src/remote/connection/fetch/negotiate.rs
diff --git a/gix/src/repository/index.rs b/gix/src/repository/index.rs
diff --git a/gix/src/revision/walk.rs b/gix/src/revision/walk.rs
diff --git a/gix/tests/repository/config/config_snapshot/mod.rs b/gix/tests/repository/config/config_snapshot/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@ pub struct Options {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`pub(crate) mod function {`
`9`		`- use std::io;`
`10`		`- use std::path::Path;`
	`9`	`+ use std::{io, path::Path};`
`11`	`10`
`12`	`11`	`use anyhow::bail;`
`13`	`12`	`use gix::prelude::FindExt;`