27 files changed, 91 insertions, 60 deletions

diff --git a/src/config.rs b/src/config.rs
index b476ffe..2b6c5b6 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,14 +1,14 @@
-use serde::de::Deserialize;
-use serde::ser::Serialize;
 use std::collections::HashMap;
 use std::fmt::Debug;
 
-use error::*;
-use ser::ConfigSerializer;
-use source::Source;
+use serde::de::Deserialize;
+use serde::ser::Serialize;
 
-use path;
-use value::{Table, Value};
+use crate::error::*;
+use crate::path;
+use crate::ser::ConfigSerializer;
+use crate::source::Source;
+use crate::value::{Table, Value};
 
 /// A prioritized configuration repository. It maintains a set of
 /// configuration sources, fetches values to populate those, and provides
diff --git a/src/de.rs b/src/de.rs
index b00922d..bfc8c9a 100644
--- a/src/de.rs
+++ b/src/de.rs
@@ -1,9 +1,11 @@
-use config::Config;
-use error::*;
-use serde::de;
 use std::collections::{HashMap, VecDeque};
 use std::iter::Enumerate;
-use value::{Table, Value, ValueKind};
+
+use serde::de;
+
+use crate::config::Config;
+use crate::error::*;
+use crate::value::{Table, Value, ValueKind};
 
 impl<'de> de::Deserializer<'de> for Value {
     type Error = ConfigError;
diff --git a/src/env.rs b/src/env.rs
index 5fc299d..7b4bacd 100644
--- a/src/env.rs
+++ b/src/env.rs
@@ -1,8 +1,9 @@
-use error::*;
-use source::Source;
 use std::collections::HashMap;
 use std::env;
-use value::{Value, ValueKind};
+
+use crate::error::*;
+use crate::source::Source;
+use crate::value::{Value, ValueKind};
 
 #[derive(Clone, Debug)]
 pub struct Environment {
diff --git a/src/error.rs b/src/error.rs
index e8babe6..c7578d8 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,10 +1,11 @@
-use nom;
-use serde::de;
-use serde::ser;
 use std::error::Error;
 use std::fmt;
 use std::result;
 
+use nom;
+use serde::de;
+use serde::ser;
+
 #[derive(Debug)]
 pub enum Unexpected {
     Bool(bool),
diff --git a/src/file/format/hjson.rs b/src/file/format/hjson.rs
index 41631ea..8a1e474 100644
--- a/src/file/format/hjson.rs
+++ b/src/file/format/hjson.rs
@@ -1,7 +1,9 @@
-use serde_hjson;
 use std::collections::HashMap;
 use std::error::Error;
-use value::{Value, ValueKind};
+
+use serde_hjson;
+
+use crate::value::{Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
diff --git a/src/file/format/ini.rs b/src/file/format/ini.rs
index 0deefb5..b45695a 100644
--- a/src/file/format/ini.rs
+++ b/src/file/format/ini.rs
@@ -1,7 +1,9 @@
-use ini::Ini;
 use std::collections::HashMap;
 use std::error::Error;
-use value::{Value, ValueKind};
+
+use ini::Ini;
+
+use crate::value::{Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
diff --git a/src/file/format/json.rs b/src/file/format/json.rs
index 6a05051..568a16b 100644
--- a/src/file/format/json.rs
+++ b/src/file/format/json.rs
@@ -1,7 +1,9 @@
-use serde_json;
 use std::collections::HashMap;
 use std::error::Error;
-use value::{Value, ValueKind};
+
+use serde_json;
+
+use crate::value::{Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
diff --git a/src/file/format/mod.rs b/src/file/format/mod.rs
index c6367c4..0ceeaf4 100644
--- a/src/file/format/mod.rs
+++ b/src/file/format/mod.rs
@@ -4,7 +4,8 @@
 
 use std::collections::HashMap;
 use std::error::Error;
-use value::Value;
+
+use crate::value::Value;
 
 #[cfg(feature = "toml")]
 mod toml;
diff --git a/src/file/format/toml.rs b/src/file/format/toml.rs
index 409f73f..c5b7a7d 100644
--- a/src/file/format/toml.rs
+++ b/src/file/format/toml.rs
@@ -1,7 +1,9 @@
 use std::collections::HashMap;
 use std::error::Error;
+
 use toml;
-use value::{Value, ValueKind};
+
+use crate::value::{Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
diff --git a/src/file/format/yaml.rs b/src/file/format/yaml.rs
index 18716f6..2526395 100644
--- a/src/file/format/yaml.rs
+++ b/src/file/format/yaml.rs
@@ -2,9 +2,11 @@ use std::collections::HashMap;
 use std::error::Error;
 use std::fmt;
 use std::mem;
-use value::{Value, ValueKind};
+
 use yaml_rust as yaml;
 
+use crate::value::{Value, ValueKind};
+
 pub fn parse(
     uri: Option<&String>,
     text: &str,
diff --git a/src/file/mod.rs b/src/file/mod.rs
index 73dfad4..b00a271 100644
--- a/src/file/mod.rs
+++ b/src/file/mod.rs
@@ -1,11 +1,12 @@
 mod format;
 pub mod source;
 
-use error::*;
-use source::Source;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
-use value::Value;
+
+use crate::error::*;
+use crate::source::Source;
+use crate::value::Value;
 
 pub use self::format::FileFormat;
 use self::source::FileSource;
diff --git a/src/file/source/file.rs b/src/file/source/file.rs
index 12805fd..75634dd 100644
--- a/src/file/source/file.rs
+++ b/src/file/source/file.rs
@@ -1,13 +1,12 @@
-use std::error::Error;
-
-use file::format::ALL_EXTENSIONS;
 use std::env;
+use std::error::Error;
 use std::fs;
 use std::io::{self, Read};
 use std::iter::Iterator;
 use std::path::{Path, PathBuf};
 
-use super::{FileFormat, FileSource};
+use crate::file::format::ALL_EXTENSIONS;
+use crate::file::{FileFormat, FileSource};
 
 /// Describes a file sourced from a file
 #[derive(Clone, Debug)]
diff --git a/src/file/source/mod.rs b/src/file/source/mod.rs
index 7d8e6a5..3b42a55 100644
--- a/src/file/source/mod.rs
+++ b/src/file/source/mod.rs
@@ -4,7 +4,7 @@ pub mod string;
 use std::error::Error;
 use std::fmt::Debug;
 
-use super::FileFormat;
+use crate::file::FileFormat;
 
 /// 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 cd2089d..2fede45 100644
--- a/src/file/source/string.rs
+++ b/src/file/source/string.rs
@@ -1,6 +1,7 @@
-use super::{FileFormat, FileSource};
 use std::error::Error;
 
+use crate::file::{FileFormat, FileSource};
+
 /// Describes a file sourced from a string
 #[derive(Clone, Debug)]
 pub struct FileSourceString(String);
diff --git a/src/path/mod.rs b/src/path/mod.rs
index c6de2a7..d58a6f2 100644
--- a/src/path/mod.rs
+++ b/src/path/mod.rs
@@ -1,7 +1,8 @@
-use error::*;
 use std::collections::HashMap;
 use std::str::FromStr;
-use value::{Value, ValueKind};
+
+use crate::error::*;
+use crate::value::{Value, ValueKind};
 
 mod parser;
 
diff --git a/src/path/parser.rs b/src/path/parser.rs
index 6c873cb..3f7bc52 100644
--- a/src/path/parser.rs
+++ b/src/path/parser.rs
@@ -1,4 +1,5 @@
-use super::Expression;
+use std::str::FromStr;
+
 use nom::{
     branch::alt,
     bytes::complete::{is_a, tag},
@@ -8,7 +9,8 @@ use nom::{
     sequence::{delimited, pair, preceded},
     Err, IResult,
 };
-use std::str::FromStr;
+
+use crate::path::Expression;
 
 fn raw_ident(i: &str) -> IResult<&str, String> {
     map(
diff --git a/src/ser.rs b/src/ser.rs
index 1113226..a303408 100644
--- a/src/ser.rs
+++ b/src/ser.rs
@@ -1,9 +1,10 @@
-use serde::ser;
 use std::fmt::Display;
 
-use error::*;
-use value::{Value, ValueKind};
-use Config;
+use serde::ser;
+
+use crate::error::*;
+use crate::value::{Value, ValueKind};
+use crate::Config;
 
 #[derive(Default, Debug)]
 pub struct ConfigSerializer {
diff --git a/src/source.rs b/src/source.rs
index 8fb4ae3..2b0eb30 100644
--- a/src/source.rs
+++ b/src/source.rs
@@ -1,9 +1,10 @@
-use error::*;
-use path;
 use std::collections::HashMap;
 use std::fmt::Debug;
 use std::str::FromStr;
-use value::{Value, ValueKind};
+
+use crate::error::*;
+use crate::path;
+use crate::value::{Value, ValueKind};
 
 /// Describes a generic _source_ of configuration properties.
 pub trait Source: Debug {
diff --git a/src/value.rs b/src/value.rs
index 39d66bf..6a2af76 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -1,9 +1,11 @@
-use error::*;
-use serde::de::{Deserialize, Deserializer, Visitor};
 use std::collections::HashMap;
 use std::fmt;
 use std::fmt::Display;
 
+use serde::de::{Deserialize, Deserializer, Visitor};
+
+use crate::error::*;
+
 /// Underlying kind of the configuration value.
 #[derive(Debug, Clone, PartialEq)]
 pub enum ValueKind {
diff --git a/tests/env.rs b/tests/env.rs
index ffc0572..578933e 100644
--- a/tests/env.rs
+++ b/tests/env.rs
@@ -1,8 +1,9 @@
 extern crate config;
 
-use config::*;
 use std::env;
 
+use config::*;
+
 #[test]
 fn test_default() {
     env::set_var("A_B_C", "abc");
diff --git a/tests/errors.rs b/tests/errors.rs
index c16ac9a..cb7f637 100644
--- a/tests/errors.rs
+++ b/tests/errors.rs
@@ -5,9 +5,10 @@ extern crate config;
 #[macro_use]
 extern crate serde_derive;
 
-use config::*;
 use std::path::PathBuf;
 
+use config::*;
+
 fn make() -> Config {
     let mut c = Config::default();
     c.merge(File::new("tests/Settings", FileFormat::Toml))
diff --git a/tests/file_hjson.rs b/tests/file_hjson.rs
index b76ccb5..4ef48ac 100644
--- a/tests/file_hjson.rs
+++ b/tests/file_hjson.rs
@@ -7,11 +7,12 @@ extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 
-use config::*;
-use float_cmp::ApproxEqUlps;
 use std::collections::HashMap;
 use std::path::PathBuf;
 
+use config::*;
+use float_cmp::ApproxEqUlps;
+
 #[derive(Debug, Deserialize)]
 struct Place {
     name: String,
diff --git a/tests/file_ini.rs b/tests/file_ini.rs
index 6dc3522..437c0d9 100644
--- a/tests/file_ini.rs
+++ b/tests/file_ini.rs
@@ -7,9 +7,10 @@ extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 
-use config::*;
 use std::path::PathBuf;
 
+use config::*;
+
 #[derive(Debug, Deserialize, PartialEq)]
 struct Place {
     name: String,
diff --git a/tests/file_json.rs b/tests/file_json.rs
index b8dcbf0..bd27572 100644
--- a/tests/file_json.rs
+++ b/tests/file_json.rs
@@ -7,11 +7,12 @@ extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 
-use config::*;
-use float_cmp::ApproxEqUlps;
 use std::collections::HashMap;
 use std::path::PathBuf;
 
+use config::*;
+use float_cmp::ApproxEqUlps;
+
 #[derive(Debug, Deserialize)]
 struct Place {
     name: String,
diff --git a/tests/file_toml.rs b/tests/file_toml.rs
index de52548..83b2630 100644
--- a/tests/file_toml.rs
+++ b/tests/file_toml.rs
@@ -7,11 +7,12 @@ extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 
-use config::*;
-use float_cmp::ApproxEqUlps;
 use std::collections::HashMap;
 use std::path::PathBuf;
 
+use config::*;
+use float_cmp::ApproxEqUlps;
+
 #[derive(Debug, Deserialize)]
 struct Place {
     number: PlaceNumber,
diff --git a/tests/file_yaml.rs b/tests/file_yaml.rs
index 892875e..b2746cd 100644
--- a/tests/file_yaml.rs
+++ b/tests/file_yaml.rs
@@ -7,11 +7,12 @@ extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 
-use config::*;
-use float_cmp::ApproxEqUlps;
 use std::collections::HashMap;
 use std::path::PathBuf;
 
+use config::*;
+use float_cmp::ApproxEqUlps;
+
 #[derive(Debug, Deserialize)]
 struct Place {
     name: String,
diff --git a/tests/get.rs b/tests/get.rs
index 8d6db51..1856cfb 100644
--- a/tests/get.rs
+++ b/tests/get.rs
@@ -7,9 +7,10 @@ extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 
+use std::collections::{HashMap, HashSet};
+
 use config::*;
 use float_cmp::ApproxEqUlps;
-use std::collections::{HashMap, HashSet};
 
 #[derive(Debug, Deserialize)]
 struct Place {