diff options
32 files changed, 32 insertions, 31 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/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 261f5e7..e15bdce 100644 --- a/tests/datetime.rs +++ b/tests/datetime.rs @@ -7,7 +7,7 @@ ))] 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 f6dc1bb..4539097 100644 --- a/tests/defaults.rs +++ b/tests/defaults.rs @@ -1,6 +1,6 @@ use serde_derive::{Deserialize, Serialize}; -use config::*; +use config::Config; #[derive(Debug, Serialize, Deserialize)] #[serde(default)] diff --git a/tests/empty.rs b/tests/empty.rs index 8ca822b..bce4f92 100644 --- a/tests/empty.rs +++ b/tests/empty.rs @@ -1,6 +1,6 @@ use serde_derive::{Deserialize, Serialize}; -use config::*; +use config::Config; #[derive(Debug, Serialize, Deserialize)] struct Settings { diff --git a/tests/env.rs b/tests/env.rs index 97fc4a2..4dafc46 100644 --- a/tests/env.rs +++ b/tests/env.rs @@ -1,4 +1,4 @@ -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 a4d661d..2b1ebd8 100644 --- a/tests/errors.rs +++ b/tests/errors.rs @@ -4,7 +4,7 @@ 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 6ad554a..7bd576e 100644 --- a/tests/file.rs +++ b/tests/file.rs @@ -1,6 +1,6 @@ #![cfg(feature = "yaml")] -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 92c020d..5223ca9 100644 --- a/tests/file_ini.rs +++ b/tests/file_ini.rs @@ -4,7 +4,7 @@ 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 3d03f5e..f7cda02 100644 --- a/tests/file_json.rs +++ b/tests/file_json.rs @@ -4,7 +4,7 @@ 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 43a3a5b..4972fa2 100644 --- a/tests/file_json5.rs +++ b/tests/file_json5.rs @@ -2,7 +2,7 @@ use serde_derive::Deserialize; -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 1b3dd31..e642f11 100644 --- a/tests/file_ron.rs +++ b/tests/file_ron.rs @@ -4,7 +4,7 @@ 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 2e2f7e8..66e3453 100644 --- a/tests/file_toml.rs +++ b/tests/file_toml.rs @@ -4,7 +4,7 @@ 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 72ae6bb..791b70a 100644 --- a/tests/file_yaml.rs +++ b/tests/file_yaml.rs @@ -4,7 +4,7 @@ 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 f411d27..283d18a 100644 --- a/tests/get.rs +++ b/tests/get.rs @@ -4,7 +4,7 @@ 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 21aa7ed..c3e8839 100644 --- a/tests/integer_range.rs +++ b/tests/integer_range.rs @@ -1,4 +1,4 @@ -use config::*; +use config::Config; #[test] fn wrapping_u16() { diff --git a/tests/legacy/env.rs b/tests/legacy/env.rs index e127619..cde1482 100644 --- a/tests/legacy/env.rs +++ b/tests/legacy/env.rs @@ -1,5 +1,5 @@ -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 e164062..e2b24bb 100644 --- a/tests/legacy/errors.rs +++ b/tests/legacy/errors.rs @@ -4,7 +4,7 @@ use std::path::PathBuf; use serde_derive::Deserialize; -use config::*; +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 d30e226..5900646 100644 --- a/tests/legacy/file.rs +++ b/tests/legacy/file.rs @@ -1,6 +1,6 @@ #![cfg(feature = "yaml")] -use 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 b51b634..532e74c 100644 --- a/tests/legacy/file_ini.rs +++ b/tests/legacy/file_ini.rs @@ -3,7 +3,7 @@ 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/legacy/file_json.rs b/tests/legacy/file_json.rs index 65a018c..7945f0a 100644 --- a/tests/legacy/file_json.rs +++ b/tests/legacy/file_json.rs @@ -4,7 +4,7 @@ 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/legacy/file_ron.rs b/tests/legacy/file_ron.rs index 3c540a7..71accc6 100644 --- a/tests/legacy/file_ron.rs +++ b/tests/legacy/file_ron.rs @@ -3,7 +3,7 @@ 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/legacy/file_toml.rs b/tests/legacy/file_toml.rs index dd4c952..598d47e 100644 --- a/tests/legacy/file_toml.rs +++ b/tests/legacy/file_toml.rs @@ -3,7 +3,7 @@ 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/legacy/file_yaml.rs b/tests/legacy/file_yaml.rs index 21fbcf7..5e55f90 100644 --- a/tests/legacy/file_yaml.rs +++ b/tests/legacy/file_yaml.rs @@ -4,7 +4,7 @@ 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/legacy/get.rs b/tests/legacy/get.rs index 5495fac..5e41307 100644 --- a/tests/legacy/get.rs +++ b/tests/legacy/get.rs @@ -3,7 +3,7 @@ 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/legacy/merge.rs b/tests/legacy/merge.rs index 30d9c58..74463d6 100644 --- a/tests/legacy/merge.rs +++ b/tests/legacy/merge.rs @@ -1,6 +1,6 @@ #![cfg(feature = "toml")] -use 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 b9c85b7..169e462 100644 --- a/tests/legacy/set.rs +++ b/tests/legacy/set.rs @@ -1,4 +1,4 @@ -use config::*; +use config::{Config, File, FileFormat}; #[test] fn test_set_scalar() { diff --git a/tests/merge.rs b/tests/merge.rs index 1b76c99..0469064 100644 --- a/tests/merge.rs +++ b/tests/merge.rs @@ -1,6 +1,6 @@ #![cfg(feature = "toml")] -use config::*; +use config::{Config, File, FileFormat, Map}; fn make() -> Config { Config::builder() diff --git a/tests/set.rs b/tests/set.rs index c540450..59b5b84 100644 --- a/tests/set.rs +++ b/tests/set.rs @@ -1,4 +1,4 @@ -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 a6f22ed..c997fe0 100644 --- a/tests/weird_keys.rs +++ b/tests/weird_keys.rs @@ -6,7 +6,7 @@ use serde_derive::{Deserialize, Serialize}; -use config::*; +use config::{File, FileFormat}; /// Helper fn to test the different deserializations fn test_config_as<'a, T>(config: &str, format: FileFormat) -> T |