Apply nightly rustfmt rules.

Applied via `make rustfmt`, which enables these nightly-only rules: ``` group_imports = "StdExternalCrate" imports_granularity = "Crate" ``` Keep git-config in its original form for now

Conor Davis committed 5 years ago

Commit 5e0edba1 parent 19f21a4275 files · +1173 −723Browse files

Showing the changes to git-object/src/immutable/commit (3 of 275 files). Show all

Unified · Split

3 files

git-object/src/immutable/commit/decode.rs +2 −3
git-object/src/immutable/commit/iter.rs +7 −5
git-object/src/immutable/commit/mod.rs +2 −1

git-object/src/immutable/commit/decode.rs+2−3

 use nom::{
     branch::alt,
-    bytes::{complete::is_not, complete::tag},
+    bytes::complete::{is_not, tag},
     combinator::{all_consuming, opt},
-    error::context,
+    error::{context, ContextError, ParseError},
-    error::{ContextError, ParseError},
     multi::many0,
     IResult,
 };

git-object/src/immutable/commit/iter.rs+7−5

@@ -1,7 +1,5 @@
1	use crate::{	1	use std::borrow::Cow;
2	bstr::ByteSlice,	2
3	immutable::{commit::decode, object, parse, parse::NL},
4	};
5	use bstr::BStr;	3	use bstr::BStr;
6	use git_hash::{oid, ObjectId};	4	use git_hash::{oid, ObjectId};
7	use nom::{	5	use nom::{
@@ -10,7 +8,11 @@ use nom::{ · 2 unmodified lines
10	combinator::{all_consuming, opt},	8	combinator::{all_consuming, opt},
11	error::context,	9	error::context,
12	};	10	};
13	use std::borrow::Cow;	11
		12	use crate::{
		13	bstr::ByteSlice,
		14	immutable::{commit::decode, object, parse, parse::NL},
		15	};
14		16
15	#[derive(Copy, Clone)]	17	#[derive(Copy, Clone)]
16	enum SignatureKind {	18	enum SignatureKind {

git-object/src/immutable/commit/mod.rs+2−1

@@ -1,6 +1,7 @@
1	use smallvec::SmallVec;
2	use std::borrow::Cow;	1	use std::borrow::Cow;
3		2
		3	use smallvec::SmallVec;
		4
4	use crate::{immutable::object, BStr};	5	use crate::{immutable::object, BStr};
5		6
6	mod decode;	7	mod decode;