diff options
Diffstat (limited to 'src/builder.rs')
-rw-r--r-- | src/builder.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/builder.rs b/src/builder.rs index 1461766..3a5d524 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use std::iter::IntoIterator; use crate::error::Result; -use crate::map::MapImpl; +use crate::map::Map; use crate::source::AsyncSource; use crate::{config::Config, path::Expression, source::Source, value::Value}; @@ -88,8 +88,8 @@ use crate::{config::Config, path::Expression, source::Source, value::Value}; /// ``` #[derive(Debug, Clone, Default)] pub struct ConfigBuilder<St: BuilderState> { - defaults: MapImpl<Expression, Value>, - overrides: MapImpl<Expression, Value>, + defaults: Map<Expression, Value>, + overrides: Map<Expression, Value>, state: St, } @@ -121,8 +121,8 @@ pub struct DefaultState { /// Refer to [`ConfigBuilder`] for similar API sample usage or to the examples folder of the crate, where such a source is implemented. #[derive(Debug, Clone, Default)] pub struct AsyncConfigBuilder { - defaults: MapImpl<Expression, Value>, - overrides: MapImpl<Expression, Value>, + defaults: Map<Expression, Value>, + overrides: Map<Expression, Value>, sources: Vec<SourceType>, } @@ -245,11 +245,11 @@ impl ConfigBuilder<DefaultState> { } fn build_internal( - defaults: MapImpl<Expression, Value>, - overrides: MapImpl<Expression, Value>, + defaults: Map<Expression, Value>, + overrides: Map<Expression, Value>, sources: &[Box<dyn Source + Send + Sync>], ) -> Result<Config> { - let mut cache: Value = MapImpl::<String, Value>::new().into(); + let mut cache: Value = Map::<String, Value>::new().into(); // Add defaults for (key, val) in defaults.into_iter() { @@ -323,11 +323,11 @@ impl ConfigBuilder<AsyncState> { } async fn build_internal( - defaults: MapImpl<Expression, Value>, - overrides: MapImpl<Expression, Value>, + defaults: Map<Expression, Value>, + overrides: Map<Expression, Value>, sources: &[SourceType], ) -> Result<Config> { - let mut cache: Value = MapImpl::<String, Value>::new().into(); + let mut cache: Value = Map::<String, Value>::new().into(); // Add defaults for (key, val) in defaults.into_iter() { |