Run rustfmt

Author: phil-opp

src/config.rs

@@ -1,5 +1,5 @@
-use serde_json;
 use cargo_metadata;
+use serde_json;
 use std::path::PathBuf;
 
 #[derive(Debug, Hash)]
@@ -17,7 +17,9 @@ struct ParseConfig {
 impl Config {
     pub fn from_metadata(metadata: &cargo_metadata::Metadata) -> Result<Config, serde_json::Error> {
         let package_metadata = metadata.packages.first().map(|p| &p.metadata);
-        let crate_metadata = package_metadata.as_ref().and_then(|m| m.get("cargo-xbuild"));
+        let crate_metadata = package_metadata
+            .as_ref()
+            .and_then(|m| m.get("cargo-xbuild"));
         let config = match crate_metadata {
             Some(json) => serde_json::from_value(json.clone())?,
             None => ParseConfig::default(),

src/extensions.rs

@@ -1,5 +1,5 @@
-use std::io::Write;
 use std::io;
+use std::io::Write;
 use std::process::{Command, ExitStatus};
 
 use errors::*;

src/flock.rs

@@ -6,8 +6,8 @@ use std::io::Write;
 use std::path::{Display, Path, PathBuf};
 use std::{fs, io};
 
-use fs2::FileExt;
 use fs2;
+use fs2::FileExt;
 
 #[derive(PartialEq)]
 enum State {

src/main.rs

@@ -25,14 +25,14 @@ use rustc::Target;
 
 mod cargo;
 mod cli;
+mod config;
 mod errors;
 mod extensions;
 mod flock;
 mod rustc;
 mod sysroot;
 mod util;
 mod xargo;
-mod config;
 
 const HELP: &str = include_str!("help.txt");
 

src/rustc.rs

@@ -6,13 +6,13 @@ use std::process::Command;
 
 pub use rustc_version::version_meta as version;
 
-use serde_json::Value;
 use serde_json;
+use serde_json::Value;
 use walkdir::WalkDir;
 
-use CurrentDirectory;
 use errors::*;
 use extensions::CommandExt;
+use CurrentDirectory;
 use {rustc, util};
 
 fn command() -> Command {

src/sysroot.rs

@@ -1,22 +1,22 @@
 use std::collections::hash_map::DefaultHasher;
+use std::env;
 use std::hash::{Hash, Hasher};
 use std::path::Path;
 use std::process::Command;
-use std::env;
 
 use rustc_version::VersionMeta;
 use tempdir::TempDir;
 use toml::{Table, Value};
 
-use CompilationMode;
+use cargo;
 use cargo::Rustflags;
+use config::Config;
 use errors::*;
 use extensions::CommandExt;
 use rustc::{Src, Sysroot, Target};
 use util;
 use xargo::Home;
-use cargo;
-use config::Config;
+use CompilationMode;
 
 #[cfg(feature = "dev")]
 fn profile() -> &'static str {
@@ -187,17 +187,12 @@ version = "0.0.0"
     let mut compiler_builtin_dep = Table::new();
     compiler_builtin_dep.insert("path".to_owned(), Value::String(path));
 
-    let mut features = vec![
-            Value::String("compiler-builtins".to_owned()),
-        ];
+    let mut features = vec![Value::String("compiler-builtins".to_owned())];
     if config.memcpy {
         features.push(Value::String("mem".to_owned()));
     }
     compiler_builtin_dep.insert("default-features".to_owned(), Value::Boolean(false));
-    compiler_builtin_dep.insert(
-        "features".to_owned(),
-        Value::Array(features),
-    );
+    compiler_builtin_dep.insert("features".to_owned(), Value::Array(features));
     let mut deps = Table::new();
     deps.insert(
         "compiler_builtins".to_owned(),

src/util.rs

@@ -1,7 +1,7 @@
+use std::fs;
 use std::fs::File;
 use std::io::{Read, Write};
 use std::path::Path;
-use std::fs;
 
 use toml::{Parser, Value};
 use walkdir::WalkDir;
@@ -59,11 +59,9 @@ pub fn mkdir(path: &Path) -> Result<()> {
 
 /// Parses `path` as TOML
 pub fn parse(path: &Path) -> Result<Value> {
-    Ok(Value::Table(Parser::new(&read(path)?)
-        .parse()
-        .ok_or_else(|| {
-            format!("{} is not valid TOML", path.display())
-        })?))
+    Ok(Value::Table(Parser::new(&read(path)?).parse().ok_or_else(
+        || format!("{} is not valid TOML", path.display()),
+    )?))
 }
 
 pub fn read(path: &Path) -> Result<String> {
@@ -120,4 +118,4 @@ pub fn escape_argument_spaces<S: Into<String>>(arg: S) -> String {
     */
 
     escaped
-}
+}

src/xargo.rs

@@ -1,18 +1,18 @@
-use std::path::{Display, PathBuf};
-use std::process::{Command, ExitStatus};
-use std::mem;
 use std::io::{self, Write};
+use std::mem;
 use std::path::Path;
+use std::path::{Display, PathBuf};
+use std::process::{Command, ExitStatus};
 
 use rustc_version::VersionMeta;
 
-use CompilationMode;
 use cargo::Rustflags;
 use cli::Args;
+use config::Config;
 use errors::*;
 use extensions::CommandExt;
 use flock::{FileLock, Filesystem};
-use config::Config;
+use CompilationMode;
 
 pub fn run(
     args: &Args,