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-diff/src (3 of 275 files). Show all

Unified · Split

3 files

git-diff/src/tree/changes.rs +6 −4
git-diff/src/tree/mod.rs +2 −1
git-diff/src/tree/recorder.rs +4 −2

git-diff/src/tree/changes.rs+6−4

@@ -1,11 +1,13 @@
	1	+use std::{borrow::BorrowMut, collections::VecDeque};
	2	+
	3	+use git_hash::{oid, ObjectId};
	4	+use git_object::immutable;
	5	+use quick_error::quick_error;
	6	+
1	7	use crate::{
2	8	tree,
3	9	tree::{visit::Change, TreeInfoPair},
4	10	};
5		−use git_hash::{oid, ObjectId};
6		−use git_object::immutable;
7		−use quick_error::quick_error;
8		−use std::{borrow::BorrowMut, collections::VecDeque};
9	11
10	12	quick_error! {
11	13	/// The error returned by [tree::Changes::needed_to_obtain()].

git-diff/src/tree/mod.rs+2−1

@@ -1,6 +1,7 @@
	1	+use std::collections::VecDeque;
	2	+
1	3	use git_hash::ObjectId;
2	4	use git_object::immutable;
3		−use std::collections::VecDeque;
4	5
5	6	/// The state required to visit [Changes] to be instantiated with `State::default()`.
6	7	#[derive(Default, Clone)]

git-diff/src/tree/recorder.rs+4−2

@@ -1,10 +1,12 @@
1		−use crate::tree::visit;
	1	+use std::collections::{BTreeMap, VecDeque};
	2	+
2	3	use git_hash::ObjectId;
3	4	use git_object::{
4	5	bstr::{BStr, BString, ByteSlice, ByteVec},
5	6	tree,
6	7	};
7		−use std::collections::{BTreeMap, VecDeque};
	8	+
	9	+use crate::tree::visit;
8	10
9	11	/// A Change as observed by a call to [`visit(…)`][visit::Visit::visit()], enhanced with the path affected by the change.
10	12	/// Its similar to [visit::Change] but includes the path that changed.