Merge pull request #276 from danieleades/refactor/tidy-imports

Refactor/tidy imports

36 files changed, 57 insertions, 158 deletions

diff --git a/examples/glob/main.rs b/examples/glob/main.rs
index f216543..ce2de45 100644
--- a/examples/glob/main.rs
+++ b/examples/glob/main.rs
@@ -1,4 +1,4 @@
-use config::*;
+use config::{Config, File};
 use glob::glob;
 use std::collections::HashMap;
 use std::path::Path;
diff --git a/examples/global/main.rs b/examples/global/main.rs
index 3717d42..3a70253 100644
--- a/examples/global/main.rs
+++ b/examples/global/main.rs
@@ -1,9 +1,5 @@
-#[macro_use]
-extern crate lazy_static;
-
-extern crate config;
-
 use config::Config;
+use lazy_static::lazy_static;
 use std::error::Error;
 use std::sync::RwLock;
 
diff --git a/examples/hierarchical-env/main.rs b/examples/hierarchical-env/main.rs
index 65f727d..ee1b69b 100644
--- a/examples/hierarchical-env/main.rs
+++ b/examples/hierarchical-env/main.rs
@@ -1,9 +1,3 @@
-extern crate config;
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
-
 mod settings;
 
 use settings::Settings;
diff --git a/examples/hierarchical-env/settings.rs b/examples/hierarchical-env/settings.rs
index 7801380..6286e5c 100644
--- a/examples/hierarchical-env/settings.rs
+++ b/examples/hierarchical-env/settings.rs
@@ -1,4 +1,5 @@
 use config::{Config, ConfigError, Environment, File};
+use serde_derive::Deserialize;
 use std::env;
 
 #[derive(Debug, Deserialize)]
diff --git a/examples/watch/main.rs b/examples/watch/main.rs
index a86dd42..25d4b59 100644
--- a/examples/watch/main.rs
+++ b/examples/watch/main.rs
@@ -1,4 +1,4 @@
-use config::*;
+use config::{Config, File};
 use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
 use std::collections::HashMap;
 use std::sync::mpsc::channel;
diff --git a/tests/async_builder.rs b/tests/async_builder.rs
index 5fcabeb..6fea92c 100644
--- a/tests/async_builder.rs
+++ b/tests/async_builder.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use config::*;
+use config::{AsyncSource, Config, ConfigError, FileFormat, Format, Map, Value};
 use std::{env, fs, path, str::FromStr};
 use tokio::fs::read_to_string;
 
diff --git a/tests/datetime.rs b/tests/datetime.rs
index 6f40948..e15bdce 100644
--- a/tests/datetime.rs
+++ b/tests/datetime.rs
@@ -6,11 +6,8 @@
     feature = "ron",
 ))]
 
-extern crate chrono;
-extern crate config;
-
 use chrono::{DateTime, TimeZone, Utc};
-use config::*;
+use config::{Config, File, FileFormat};
 
 fn make() -> Config {
     Config::builder()
diff --git a/tests/defaults.rs b/tests/defaults.rs
index 724d6a2..4539097 100644
--- a/tests/defaults.rs
+++ b/tests/defaults.rs
@@ -1,9 +1,6 @@
-extern crate config;
+use serde_derive::{Deserialize, Serialize};
 
-#[macro_use]
-extern crate serde_derive;
-
-use config::*;
+use config::Config;
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(default)]
diff --git a/tests/empty.rs b/tests/empty.rs
index 18634fc..bce4f92 100644
--- a/tests/empty.rs
+++ b/tests/empty.rs
@@ -1,9 +1,6 @@
-extern crate config;
+use serde_derive::{Deserialize, Serialize};
 
-#[macro_use]
-extern crate serde_derive;
-
-use config::*;
+use config::Config;
 
 #[derive(Debug, Serialize, Deserialize)]
 struct Settings {
diff --git a/tests/env.rs b/tests/env.rs
index 1f7a263..4dafc46 100644
--- a/tests/env.rs
+++ b/tests/env.rs
@@ -1,7 +1,4 @@
-extern crate config;
-extern crate serde_derive;
-
-use config::*;
+use config::{Config, Environment, Source};
 use serde_derive::Deserialize;
 use std::env;
 
diff --git a/tests/errors.rs b/tests/errors.rs
index 1c4edb9..2b1ebd8 100644
--- a/tests/errors.rs
+++ b/tests/errors.rs
@@ -1,13 +1,10 @@
 #![cfg(feature = "toml")]
 
-extern crate config;
-
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 use std::path::PathBuf;
 
-use config::*;
+use config::{Config, ConfigError, File, FileFormat, Map, Value};
 
 fn make() -> Config {
     Config::builder()
diff --git a/tests/file.rs b/tests/file.rs
index c282691..7bd576e 100644
--- a/tests/file.rs
+++ b/tests/file.rs
@@ -1,8 +1,6 @@
 #![cfg(feature = "yaml")]
 
-extern crate config;
-
-use config::*;
+use config::{Config, File, FileFormat};
 
 #[test]
 fn test_file_not_required() {
diff --git a/tests/file_ini.rs b/tests/file_ini.rs
index d72b46c..5223ca9 100644
--- a/tests/file_ini.rs
+++ b/tests/file_ini.rs
@@ -1,15 +1,10 @@
 #![cfg(feature = "ini")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 use std::path::PathBuf;
 
-use config::*;
+use config::{Config, File, FileFormat};
 
 #[derive(Debug, Deserialize, PartialEq)]
 struct Place {
diff --git a/tests/file_json.rs b/tests/file_json.rs
index 5a04afd..f7cda02 100644
--- a/tests/file_json.rs
+++ b/tests/file_json.rs
@@ -1,15 +1,10 @@
 #![cfg(feature = "json")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 use std::path::PathBuf;
 
-use config::*;
+use config::{Config, File, FileFormat, Map, Value};
 use float_cmp::ApproxEqUlps;
 
 #[derive(Debug, Deserialize)]
diff --git a/tests/file_json5.rs b/tests/file_json5.rs
index bd56b0f..4972fa2 100644
--- a/tests/file_json5.rs
+++ b/tests/file_json5.rs
@@ -1,13 +1,8 @@
 #![cfg(feature = "json5")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
+use serde_derive::Deserialize;
 
-#[macro_use]
-extern crate serde_derive;
-
-use config::*;
+use config::{Config, File, FileFormat, Map, Value};
 use float_cmp::ApproxEqUlps;
 use std::path::PathBuf;
 
diff --git a/tests/file_ron.rs b/tests/file_ron.rs
index a06b8d4..e642f11 100644
--- a/tests/file_ron.rs
+++ b/tests/file_ron.rs
@@ -1,15 +1,10 @@
 #![cfg(feature = "ron")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 use std::path::PathBuf;
 
-use config::*;
+use config::{Config, File, FileFormat, Map, Value};
 use float_cmp::ApproxEqUlps;
 
 #[derive(Debug, Deserialize)]
diff --git a/tests/file_toml.rs b/tests/file_toml.rs
index 1033b6a..66e3453 100644
--- a/tests/file_toml.rs
+++ b/tests/file_toml.rs
@@ -1,15 +1,10 @@
 #![cfg(feature = "toml")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 use std::path::PathBuf;
 
-use config::*;
+use config::{Config, File, FileFormat, Map, Value};
 use float_cmp::ApproxEqUlps;
 
 #[derive(Debug, Deserialize)]
diff --git a/tests/file_yaml.rs b/tests/file_yaml.rs
index 440f985..791b70a 100644
--- a/tests/file_yaml.rs
+++ b/tests/file_yaml.rs
@@ -1,15 +1,10 @@
 #![cfg(feature = "yaml")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 use std::path::PathBuf;
 
-use config::*;
+use config::{Config, File, FileFormat, Map, Value};
 use float_cmp::ApproxEqUlps;
 
 #[derive(Debug, Deserialize)]
diff --git a/tests/get.rs b/tests/get.rs
index 79028c5..283d18a 100644
--- a/tests/get.rs
+++ b/tests/get.rs
@@ -1,15 +1,10 @@
 #![cfg(feature = "toml")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
+use serde_derive::Deserialize;
 
 use std::collections::HashSet;
 
-use config::*;
+use config::{Config, File, FileFormat, Map, Value};
 use float_cmp::ApproxEqUlps;
 
 #[derive(Debug, Deserialize)]
diff --git a/tests/integer_range.rs b/tests/integer_range.rs
index 626f159..c3e8839 100644
--- a/tests/integer_range.rs
+++ b/tests/integer_range.rs
@@ -1,6 +1,4 @@
-extern crate config;
-
-use config::*;
+use config::Config;
 
 #[test]
 fn wrapping_u16() {
diff --git a/tests/legacy/datetime.rs b/tests/legacy/datetime.rs
index cde3edd..7e63e68 100644
--- a/tests/legacy/datetime.rs
+++ b/tests/legacy/datetime.rs
@@ -7,9 +7,6 @@
     feature = "ron",
 ))]
 
-extern crate chrono;
-extern crate config;
-
 use self::chrono::{DateTime, TimeZone, Utc};
 use self::config::*;
 
diff --git a/tests/legacy/env.rs b/tests/legacy/env.rs
index 775b8d7..cde1482 100644
--- a/tests/legacy/env.rs
+++ b/tests/legacy/env.rs
@@ -1,7 +1,5 @@
-extern crate config;
-extern crate serde_derive;
 
-use config::*;
+use config::{Config};
 use serde_derive::Deserialize;
 use std::env;
 
diff --git a/tests/legacy/errors.rs b/tests/legacy/errors.rs
index 06b67ab..e2b24bb 100644
--- a/tests/legacy/errors.rs
+++ b/tests/legacy/errors.rs
@@ -1,10 +1,10 @@
 #![cfg(feature = "toml")]
 
-extern crate config;
-
 use std::path::PathBuf;
 
-use self::config::*;
+use serde_derive::Deserialize;
+
+use config::{Config, ConfigError, File, FileFormat, Map, Value};
 
 fn make() -> Config {
     let mut c = Config::default();
diff --git a/tests/legacy/file.rs b/tests/legacy/file.rs
index 7ec8e65..5900646 100644
--- a/tests/legacy/file.rs
+++ b/tests/legacy/file.rs
@@ -1,8 +1,6 @@
 #![cfg(feature = "yaml")]
 
-extern crate config;
-
-use self::config::*;
+use config::{Config, File, FileFormat};
 
 #[test]
 fn test_file_not_required() {
diff --git a/tests/legacy/file_ini.rs b/tests/legacy/file_ini.rs
index d15f5e2..532e74c 100644
--- a/tests/legacy/file_ini.rs
+++ b/tests/legacy/file_ini.rs
@@ -1,12 +1,9 @@
 #![cfg(feature = "ini")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
-
+use serde_derive::Deserialize;
 use std::path::PathBuf;
 
-use self::config::*;
+use config::{Config, File, FileFormat};
 
 #[derive(Debug, Deserialize, PartialEq)]
 struct Place {
diff --git a/tests/legacy/file_json.rs b/tests/legacy/file_json.rs
index 3424941..7945f0a 100644
--- a/tests/legacy/file_json.rs
+++ b/tests/legacy/file_json.rs
@@ -1,13 +1,11 @@
 #![cfg(feature = "json")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
+use serde_derive::Deserialize;
 
 use std::path::PathBuf;
 
-use self::config::*;
-use self::float_cmp::ApproxEqUlps;
+use config::{Config, File, FileFormat, Map, Value};
+use float_cmp::ApproxEqUlps;
 
 #[derive(Debug, Deserialize)]
 struct Place {
diff --git a/tests/legacy/file_ron.rs b/tests/legacy/file_ron.rs
index 759a2bf..71accc6 100644
--- a/tests/legacy/file_ron.rs
+++ b/tests/legacy/file_ron.rs
@@ -1,13 +1,10 @@
 #![cfg(feature = "ron")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
-
+use serde_derive::Deserialize;
 use std::path::PathBuf;
 
-use self::config::*;
-use self::float_cmp::ApproxEqUlps;
+use config::{Config, File, FileFormat, Map, Value};
+use float_cmp::ApproxEqUlps;
 
 #[derive(Debug, Deserialize)]
 struct Place {
diff --git a/tests/legacy/file_toml.rs b/tests/legacy/file_toml.rs
index aa4d05f..598d47e 100644
--- a/tests/legacy/file_toml.rs
+++ b/tests/legacy/file_toml.rs
@@ -1,13 +1,10 @@
 #![cfg(feature = "toml")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
-
+use serde_derive::Deserialize;
 use std::path::PathBuf;
 
-use self::config::*;
-use self::float_cmp::ApproxEqUlps;
+use config::{Config, File, FileFormat, Map, Value};
+use float_cmp::ApproxEqUlps;
 
 #[derive(Debug, Deserialize)]
 struct Place {
diff --git a/tests/legacy/file_yaml.rs b/tests/legacy/file_yaml.rs
index 530e42b..5e55f90 100644
--- a/tests/legacy/file_yaml.rs
+++ b/tests/legacy/file_yaml.rs
@@ -1,13 +1,11 @@
 #![cfg(feature = "yaml")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
+use serde_derive::Deserialize;
 
 use std::path::PathBuf;
 
-use self::config::*;
-use self::float_cmp::ApproxEqUlps;
+use config::{Config, File, FileFormat, Map, Value};
+use float_cmp::ApproxEqUlps;
 
 #[derive(Debug, Deserialize)]
 struct Place {
diff --git a/tests/legacy/get.rs b/tests/legacy/get.rs
index 709d0e9..5e41307 100644
--- a/tests/legacy/get.rs
+++ b/tests/legacy/get.rs
@@ -1,13 +1,10 @@
 #![cfg(feature = "toml")]
 
-extern crate config;
-extern crate float_cmp;
-extern crate serde;
-
+use serde_derive::Deserialize;
 use std::collections::HashSet;
 
-use self::config::*;
-use self::float_cmp::ApproxEqUlps;
+use config::{Config, File, FileFormat, Map, Value};
+use float_cmp::ApproxEqUlps;
 
 #[derive(Debug, Deserialize)]
 struct Place {
diff --git a/tests/legacy/merge.rs b/tests/legacy/merge.rs
index 8f70971..74463d6 100644
--- a/tests/legacy/merge.rs
+++ b/tests/legacy/merge.rs
@@ -1,8 +1,6 @@
 #![cfg(feature = "toml")]
 
-extern crate config;
-
-use self::config::*;
+use config::{Config, File, FileFormat, Map};
 
 fn make() -> Config {
     let mut c = Config::default();
diff --git a/tests/legacy/set.rs b/tests/legacy/set.rs
index 7a3e3a3..169e462 100644
--- a/tests/legacy/set.rs
+++ b/tests/legacy/set.rs
@@ -1,6 +1,4 @@
-extern crate config;
-
-use self::config::*;
+use config::{Config, File, FileFormat};
 
 #[test]
 fn test_set_scalar() {
diff --git a/tests/legacy_tests.rs b/tests/legacy_tests.rs
index e38bddd..ce28838 100644
--- a/tests/legacy_tests.rs
+++ b/tests/legacy_tests.rs
@@ -1,5 +1,2 @@
 #[allow(deprecated)]
 pub mod legacy;
-
-#[macro_use]
-extern crate serde_derive;
diff --git a/tests/merge.rs b/tests/merge.rs
index cbf2993..0469064 100644
--- a/tests/merge.rs
+++ b/tests/merge.rs
@@ -1,8 +1,6 @@
 #![cfg(feature = "toml")]
 
-extern crate config;
-
-use config::*;
+use config::{Config, File, FileFormat, Map};
 
 fn make() -> Config {
     Config::builder()
diff --git a/tests/set.rs b/tests/set.rs
index 4c827d8..59b5b84 100644
--- a/tests/set.rs
+++ b/tests/set.rs
@@ -1,6 +1,4 @@
-extern crate config;
-
-use config::*;
+use config::{Config, File, FileFormat};
 
 #[test]
 fn test_set_override_scalar() {
diff --git a/tests/weird_keys.rs b/tests/weird_keys.rs
index 79f3a14..c997fe0 100644
--- a/tests/weird_keys.rs
+++ b/tests/weird_keys.rs
@@ -4,13 +4,9 @@
 // Please don't be offended!
 //
 
-extern crate config;
+use serde_derive::{Deserialize, Serialize};
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde;
-
-use config::*;
+use config::{File, FileFormat};
 
 /// Helper fn to test the different deserializations
 fn test_config_as<'a, T>(config: &str, format: FileFormat) -> T