diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index 5765125a5..d5265250c 100644
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -1,14 +1,14 @@
extern crate cargo;
+extern crate clap;
extern crate env_logger;
#[macro_use]
extern crate failure;
extern crate git2_curl;
-extern crate toml;
extern crate log;
#[macro_use]
extern crate serde_derive;
extern crate serde_json;
-extern crate clap;
+extern crate toml;
use std::env;
use std::fs;
@@ -16,14 +16,13 @@ use std::path::{Path, PathBuf};
use std::collections::BTreeSet;
use cargo::core::shell::Shell;
-use cargo::util::{self, CliResult, lev_distance, Config, CargoResult};
+use cargo::util::{self, lev_distance, CargoResult, CliResult, Config};
use cargo::util::{CliError, ProcessError};
mod cli;
mod command_prelude;
mod commands;
-
fn main() {
env_logger::init();
@@ -53,7 +52,8 @@ fn aliased_command(config: &Config, command: &str) -> CargoResult