Revert "Run 'cargo fmt'" (outdated rustfmt)

This reverts commit dd40f7545d.

src/app.rs

@@ -4,8 +4,8 @@ use std::str::FromStr;
 
 use atty::{self, Stream};
 
-use clap::ArgMatches;
 use crate::clap_app;
+use clap::ArgMatches;
 use wild;
 
 use console::Term;

src/decorations.rs

@@ -1,6 +1,6 @@
-use ansi_term::Style;
 use crate::diff::LineChange;
 use crate::printer::{Colors, InteractivePrinter};
+use ansi_term::Style;
 
 #[derive(Clone)]
 pub struct DecorationText {