rustfmt: sort imports

9ae0df0a · Ben Boeckel · c9ec1f31 · 9ae0df0a
Commit 9ae0df0a authored Aug 28, 2018 by Ben Boeckel
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/lib.rs src/lib.rs +2 -2

No files found.
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,8 +43,8 @@ mod prepare;

 pub use error::Error;
 pub use error::ErrorKind;
-pub use error::ResultExt;
 pub use error::Result;
+pub use error::ResultExt;

 pub use git::CommitId;
 pub use git::GitContext;
@@ -52,9 +52,9 @@ pub use git::Identity;
 pub use git::MergeStatus;

 pub use prepare::Conflict;
+pub use prepare::GitWorkArea;
 pub use prepare::MergeCommand;
 pub use prepare::MergeResult;
-pub use prepare::GitWorkArea;
 pub use prepare::SubmoduleConfig;

 #[cfg(test)]