Run rustfmt (nightly)

9 files changed, 46 insertions, 38 deletions

diff --git a/src/file/format/hjson.rs b/src/file/format/hjson.rs
index 3d4ad1b..bb21e38 100644
--- a/src/file/format/hjson.rs
+++ b/src/file/format/hjson.rs
@@ -27,7 +27,7 @@ fn from_hjson_value(uri: Option<&String>, value: &serde_hjson::Value) -> Value {
         serde_hjson::Value::U64(value) => Value::new(uri, ValueKind::Integer(value as i64)),
 
         serde_hjson::Value::F64(value) => Value::new(uri, ValueKind::Float(value)),
-        
+
         serde_hjson::Value::Bool(value) => Value::new(uri, ValueKind::Boolean(value)),
 
         serde_hjson::Value::Object(ref table) => {
diff --git a/src/file/format/ini.rs b/src/file/format/ini.rs
index b7c0f71..b4b4ada 100644
--- a/src/file/format/ini.rs
+++ b/src/file/format/ini.rs
@@ -1,8 +1,8 @@
+use ini::Ini;
 use source::Source;
 use std::collections::HashMap;
 use std::error::Error;
 use value::{Value, ValueKind};
-use ini::Ini;
 
 pub fn parse(
     uri: Option<&String>,
@@ -15,15 +15,22 @@ pub fn parse(
             Some(ref sec) => {
                 let mut sec_map: HashMap<String, Value> = HashMap::new();
                 for (k, v) in prop.iter() {
-                    sec_map.insert(k.to_lowercase().clone(),
-                                   Value::new(uri, ValueKind::String(v.clone())));
+                    sec_map.insert(
+                        k.to_lowercase().clone(),
+                        Value::new(uri, ValueKind::String(v.clone())),
+                    );
                 }
-                map.insert(sec.to_lowercase().clone(), Value::new(uri, ValueKind::Table(sec_map)));
+                map.insert(
+                    sec.to_lowercase().clone(),
+                    Value::new(uri, ValueKind::Table(sec_map)),
+                );
             }
             None => {
                 for (k, v) in prop.iter() {
-                    map.insert(k.to_lowercase().clone(),
-                               Value::new(uri, ValueKind::String(v.clone())));
+                    map.insert(
+                        k.to_lowercase().clone(),
+                        Value::new(uri, ValueKind::String(v.clone())),
+                    );
                 }
             }
         }
diff --git a/src/file/format/mod.rs b/src/file/format/mod.rs
index c01c386..39b3813 100644
--- a/src/file/format/mod.rs
+++ b/src/file/format/mod.rs
@@ -3,9 +3,9 @@
 #![allow(unused_mut)]
 
 use source::Source;
-use value::Value;
-use std::error::Error;
 use std::collections::HashMap;
+use std::error::Error;
+use value::Value;
 
 #[cfg(feature = "toml")]
 mod toml;
@@ -42,7 +42,6 @@ pub enum FileFormat {
     /// INI (parsed with rust_ini)
     #[cfg(feature = "ini")]
     Ini,
-
 }
 
 lazy_static! {
diff --git a/src/file/format/toml.rs b/src/file/format/toml.rs
index 9977126..da7782f 100644
--- a/src/file/format/toml.rs
+++ b/src/file/format/toml.rs
@@ -1,7 +1,7 @@
-use toml;
 use source::Source;
 use std::collections::{BTreeMap, HashMap};
 use std::error::Error;
+use toml;
 use value::{Value, ValueKind};
 
 pub fn parse(
diff --git a/src/file/format/yaml.rs b/src/file/format/yaml.rs
index 87240ac..5ec8ca6 100644
--- a/src/file/format/yaml.rs
+++ b/src/file/format/yaml.rs
@@ -1,10 +1,10 @@
-use yaml_rust as yaml;
 use source::Source;
+use std::collections::HashMap;
 use std::error::Error;
 use std::fmt;
-use std::collections::HashMap;
 use std::mem;
 use value::{Value, ValueKind};
+use yaml_rust as yaml;
 
 pub fn parse(
     uri: Option<&String>,
diff --git a/src/file/mod.rs b/src/file/mod.rs
index 6586ede..fe4f5b4 100644
--- a/src/file/mod.rs
+++ b/src/file/mod.rs
@@ -1,14 +1,14 @@
 mod format;
 pub mod source;
 
-use source::Source;
 use error::*;
-use value::Value;
+use source::Source;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
+use value::Value;
 
-use self::source::FileSource;
 pub use self::format::FileFormat;
+use self::source::FileSource;
 
 #[derive(Clone, Debug)]
 pub struct File<T>
@@ -97,7 +97,8 @@ where
 
     fn collect(&self) -> Result<HashMap<String, Value>> {
         // Coerce the file contents to a string
-        let (uri, contents, format) = match self.source
+        let (uri, contents, format) = match self
+            .source
             .resolve(self.format)
             .map_err(|err| ConfigError::Foreign(err))
         {
@@ -113,11 +114,11 @@ where
         };
 
         // Parse the string using the given format
-        format.parse(uri.as_ref(), &contents).map_err(|cause| {
-            ConfigError::FileParse {
+        format
+            .parse(uri.as_ref(), &contents)
+            .map_err(|cause| ConfigError::FileParse {
                 uri: uri,
                 cause: cause,
-            }
-        })
+            })
     }
 }
diff --git a/src/file/source/file.rs b/src/file/source/file.rs
index 80cd1dd..a413a1f 100644
--- a/src/file/source/file.rs
+++ b/src/file/source/file.rs
@@ -1,16 +1,16 @@
-use std::str::FromStr;
-use std::result;
 use std::error::Error;
+use std::result;
+use std::str::FromStr;
 
-use std::path::{Path, PathBuf};
 use file::format::ALL_EXTENSIONS;
-use std::io::{self, Read};
-use std::fs;
 use std::env;
+use std::fs;
+use std::io::{self, Read};
 use std::iter::Iterator;
+use std::path::{Path, PathBuf};
 
-use source::Source;
 use super::{FileFormat, FileSource};
+use source::Source;
 
 /// Describes a file sourced from a file
 #[derive(Clone, Debug)]
@@ -35,12 +35,13 @@ impl FileSourceFile {
                 Some(format) => Ok((filename, format)),
                 None => {
                     for (format, extensions) in ALL_EXTENSIONS.iter() {
-                        if extensions.contains(&filename
-                            .extension()
-                            .unwrap_or_default()
-                            .to_string_lossy()
-                            .as_ref())
-                        {
+                        if extensions.contains(
+                            &filename
+                                .extension()
+                                .unwrap_or_default()
+                                .to_string_lossy()
+                                .as_ref(),
+                        ) {
                             return Ok((filename, *format));
                         }
                     }
diff --git a/src/file/source/mod.rs b/src/file/source/mod.rs
index 4d9950f..5da69f1 100644
--- a/src/file/source/mod.rs
+++ b/src/file/source/mod.rs
@@ -1,11 +1,11 @@
 pub mod file;
 pub mod string;
 
-use std::fmt::Debug;
 use std::error::Error;
+use std::fmt::Debug;
 
-use source::Source;
 use super::FileFormat;
+use source::Source;
 
 /// Describes where the file is sourced
 pub trait FileSource: Debug + Clone {
diff --git a/src/file/source/string.rs b/src/file/source/string.rs
index 9c89231..a2f66cb 100644
--- a/src/file/source/string.rs
+++ b/src/file/source/string.rs
@@ -1,9 +1,9 @@
-use std::str::FromStr;
-use std::result;
 use std::error::Error;
+use std::result;
+use std::str::FromStr;
 
-use source::Source;
 use super::{FileFormat, FileSource};
+use source::Source;
 
 /// Describes a file sourced from a string
 #[derive(Clone, Debug)]