Skip to content

Commit 51c7abc

Browse files
committed
j fmt
1 parent dfb3f18 commit 51c7abc

File tree

106 files changed

+317
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+317
-275
lines changed

gitoxide-core/src/corpus/run.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
use gix::progress::DynNestedProgress;
21
use std::{path::Path, sync::atomic::AtomicBool};
32

3+
use gix::progress::DynNestedProgress;
4+
45
use crate::{
56
corpus,
67
corpus::{Run, Task},

gitoxide-core/src/index/checkout.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ use std::{
44
};
55

66
use anyhow::bail;
7-
use gix::objs::find::Error;
8-
use gix::{worktree::state::checkout, NestedProgress, Progress};
7+
use gix::{objs::find::Error, worktree::state::checkout, NestedProgress, Progress};
98

109
use crate::{
1110
index,

gitoxide-core/src/pack/receive.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ impl<W> protocol::fetch::DelegateBlocking for CloneDelegate<W> {
116116
mod blocking_io {
117117
use std::{io, io::BufRead, path::PathBuf};
118118

119-
use gix::config::tree::Key;
120119
use gix::{
121120
bstr::BString,
121+
config::tree::Key,
122122
protocol,
123123
protocol::{fetch::Response, handshake::Ref},
124124
NestedProgress,
@@ -194,18 +194,17 @@ mod blocking_io {
194194

195195
#[cfg(feature = "blocking-client")]
196196
pub use blocking_io::receive;
197-
use gix::protocol::ls_refs;
198-
use gix::NestedProgress;
197+
use gix::{protocol::ls_refs, NestedProgress};
199198

200199
#[cfg(feature = "async-client")]
201200
mod async_io {
202201
use std::{io, io::BufRead, path::PathBuf};
203202

204203
use async_trait::async_trait;
205204
use futures_io::AsyncBufRead;
206-
use gix::config::tree::Key;
207205
use gix::{
208206
bstr::{BString, ByteSlice},
207+
config::tree::Key,
209208
odb::pack,
210209
protocol,
211210
protocol::{fetch::Response, handshake::Ref},

gitoxide-core/src/query/engine/update.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
use std::cell::RefCell;
21
use std::{
2+
cell::RefCell,
33
convert::Infallible,
44
sync::atomic::{AtomicUsize, Ordering},
55
time::Instant,
66
};
77

88
use anyhow::{anyhow, bail};
9-
use gix::diff::blob::platform::prepare_diff::Operation;
10-
use gix::objs::find::Error;
119
use gix::{
1210
bstr::{BStr, BString, ByteSlice},
13-
diff::rewrites::CopySource,
11+
diff::{blob::platform::prepare_diff::Operation, rewrites::CopySource},
1412
features::progress,
13+
objs::find::Error,
1514
parallel::{InOrderIter, SequenceId},
1615
prelude::ObjectIdExt,
1716
Count, Progress,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ pub struct Options {
88
}
99

1010
pub(crate) mod function {
11-
use std::borrow::Cow;
12-
use std::{io, path::Path};
11+
use std::{borrow::Cow, io, path::Path};
1312

1413
use anyhow::{anyhow, bail};
1514
use gix::bstr::BStr;

gitoxide-core/src/repository/clone.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ pub struct Options {
1111
pub const PROGRESS_RANGE: std::ops::RangeInclusive<u8> = 1..=3;
1212

1313
pub(crate) mod function {
14-
use std::borrow::Cow;
15-
use std::ffi::OsStr;
14+
use std::{borrow::Cow, ffi::OsStr};
1615

1716
use anyhow::{bail, Context};
1817
use gix::{bstr::BString, remote::fetch::Status, NestedProgress};

gitoxide-core/src/repository/exclude.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
use std::borrow::Cow;
2-
use std::io;
1+
use std::{borrow::Cow, io};
32

43
use anyhow::{anyhow, bail};
54
use gix::bstr::BStr;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ pub(crate) mod function {
1919
use gix::revision::Spec;
2020

2121
use super::Options;
22-
use crate::repository::revision::resolve::TreeMode;
23-
use crate::{repository::revision, OutputFormat};
22+
use crate::{
23+
repository::{revision, revision::resolve::TreeMode},
24+
OutputFormat,
25+
};
2426

2527
pub fn resolve(
2628
mut repo: gix::Repository,

gitoxide-core/src/repository/status.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
use crate::OutputFormat;
21
use anyhow::{bail, Context};
3-
use gix::bstr::{BStr, BString};
4-
use gix::index::Entry;
5-
use gix::Progress;
6-
use gix_status::index_as_worktree::traits::FastEq;
7-
use gix_status::index_as_worktree::{Change, Conflict, EntryStatus};
2+
use gix::{
3+
bstr::{BStr, BString},
4+
index::Entry,
5+
Progress,
6+
};
7+
use gix_status::index_as_worktree::{traits::FastEq, Change, Conflict, EntryStatus};
8+
9+
use crate::OutputFormat;
810

911
pub enum Submodules {
1012
/// display all information about submodules, including ref changes, modifications and untracked files.

gitoxide-core/src/repository/submodule.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
use crate::OutputFormat;
21
use anyhow::bail;
3-
use gix::commit::describe::SelectRef;
4-
use gix::prelude::ObjectIdExt;
5-
use gix::{Repository, Submodule};
2+
use gix::{commit::describe::SelectRef, prelude::ObjectIdExt, Repository, Submodule};
3+
4+
use crate::OutputFormat;
65

76
pub fn list(repo: Repository, mut out: impl std::io::Write, format: OutputFormat) -> anyhow::Result<()> {
87
if format != OutputFormat::Human {

0 commit comments

Comments
 (0)