Move order preservation under a feature gate

18 files changed, 85 insertions, 78 deletions

diff --git a/src/builder.rs b/src/builder.rs
index 65f49ae..5100f5f 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -1,8 +1,9 @@
-use linked_hash_map::LinkedHashMap;
 use std::iter::IntoIterator;
 use std::str::FromStr;
 
+
 use crate::error::Result;
+use crate::map::MapImpl;
 use crate::source::AsyncSource;
 use crate::{config::Config, path::Expression, source::Source, value::Value};
 
@@ -88,8 +89,8 @@ use crate::{config::Config, path::Expression, source::Source, value::Value};
 /// ```
 #[derive(Debug, Clone, Default)]
 pub struct ConfigBuilder<St: BuilderState> {
-    defaults: LinkedHashMap<Expression, Value>,
-    overrides: LinkedHashMap<Expression, Value>,
+    defaults: MapImpl<Expression, Value>,
+    overrides: MapImpl<Expression, Value>,
     state: St,
 }
 
@@ -121,8 +122,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: LinkedHashMap<Expression, Value>,
-    overrides: LinkedHashMap<Expression, Value>,
+    defaults: MapImpl<Expression, Value>,
+    overrides: MapImpl<Expression, Value>,
     sources: Vec<SourceType>,
 }
 
@@ -245,11 +246,11 @@ impl ConfigBuilder<DefaultState> {
     }
 
     fn build_internal(
-        defaults: LinkedHashMap<Expression, Value>,
-        overrides: LinkedHashMap<Expression, Value>,
+        defaults: MapImpl<Expression, Value>,
+        overrides: MapImpl<Expression, Value>,
         sources: &[Box<dyn Source + Send + Sync>],
     ) -> Result<Config> {
-        let mut cache: Value = LinkedHashMap::<String, Value>::new().into();
+        let mut cache: Value = MapImpl::<String, Value>::new().into();
 
         // Add defaults
         for (key, val) in defaults.into_iter() {
@@ -323,11 +324,11 @@ impl ConfigBuilder<AsyncState> {
     }
 
     async fn build_internal(
-        defaults: LinkedHashMap<Expression, Value>,
-        overrides: LinkedHashMap<Expression, Value>,
+        defaults: MapImpl<Expression, Value>,
+        overrides: MapImpl<Expression, Value>,
         sources: &[SourceType],
     ) -> Result<Config> {
-        let mut cache: Value = LinkedHashMap::<String, Value>::new().into();
+        let mut cache: Value = MapImpl::<String, Value>::new().into();
 
         // Add defaults
         for (key, val) in defaults.into_iter() {
diff --git a/src/config.rs b/src/config.rs
index 6302c45..8c410f0 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,4 +1,3 @@
-use linked_hash_map::LinkedHashMap;
 use std::fmt::Debug;
 
 use crate::builder::{ConfigBuilder, DefaultState};
@@ -6,6 +5,7 @@ use serde::de::Deserialize;
 use serde::ser::Serialize;
 
 use crate::error::*;
+use crate::map::MapImpl;
 use crate::path;
 use crate::ser::ConfigSerializer;
 use crate::source::Source;
@@ -16,8 +16,8 @@ use crate::value::{Table, Value};
 /// them according to the source's priority.
 #[derive(Clone, Debug)]
 pub struct Config {
-    defaults: LinkedHashMap<path::Expression, Value>,
-    overrides: LinkedHashMap<path::Expression, Value>,
+    defaults: MapImpl<path::Expression, Value>,
+    overrides: MapImpl<path::Expression, Value>,
     sources: Vec<Box<dyn Source + Send + Sync>>,
 
     /// Root of the cached configuration.
@@ -83,7 +83,7 @@ impl Config {
     #[deprecated(since = "0.12.0", note = "please use 'ConfigBuilder' instead")]
     pub fn refresh(&mut self) -> Result<&mut Config> {
         self.cache = {
-            let mut cache: Value = LinkedHashMap::<String, Value>::new().into();
+            let mut cache: Value = MapImpl::<String, Value>::new().into();
 
             // Add defaults
             for (key, val) in self.defaults.iter() {
@@ -181,7 +181,7 @@ impl Config {
         self.get(key).and_then(Value::into_bool)
     }
 
-    pub fn get_table(&self, key: &str) -> Result<LinkedHashMap<String, Value>> {
+    pub fn get_table(&self, key: &str) -> Result<MapImpl<String, Value>> {
         self.get(key).and_then(Value::into_table)
     }
 
@@ -212,7 +212,7 @@ impl Source for Config {
         Box::new((*self).clone())
     }
 
-    fn collect(&self) -> Result<LinkedHashMap<String, Value>> {
+    fn collect(&self) -> Result<MapImpl<String, Value>> {
         self.cache.clone().into_table()
     }
 }
diff --git a/src/de.rs b/src/de.rs
index 7d66896..9aa6b45 100644
--- a/src/de.rs
+++ b/src/de.rs
@@ -1,4 +1,3 @@
-use linked_hash_map::LinkedHashMap;
 use std::collections::VecDeque;
 use std::iter::Enumerate;
 
@@ -6,6 +5,7 @@ use serde::de;
 
 use crate::config::Config;
 use crate::error::*;
+use crate::map::MapImpl;
 use crate::value::{Table, Value, ValueKind};
 
 impl<'de> de::Deserializer<'de> for Value {
@@ -200,7 +200,7 @@ struct MapAccess {
 }
 
 impl MapAccess {
-    fn new(table: LinkedHashMap<String, Value>) -> Self {
+    fn new(table: MapImpl<String, Value>) -> Self {
         MapAccess {
             elements: table.into_iter().collect(),
         }
diff --git a/src/env.rs b/src/env.rs
index 2e48701..507ace6 100644
--- a/src/env.rs
+++ b/src/env.rs
@@ -1,7 +1,7 @@
-use linked_hash_map::LinkedHashMap;
 use std::env;
 
 use crate::error::*;
+use crate::map::MapImpl;
 use crate::source::Source;
 use crate::value::{Value, ValueKind};
 
@@ -79,8 +79,8 @@ impl Source for Environment {
         Box::new((*self).clone())
     }
 
-    fn collect(&self) -> Result<LinkedHashMap<String, Value>> {
-        let mut m = LinkedHashMap::new();
+    fn collect(&self) -> Result<MapImpl<String, Value>> {
+        let mut m = MapImpl::new();
         let uri: String = "the environment".into();
 
         let separator = self.separator.as_deref().unwrap_or("");
diff --git a/src/file/format/hjson.rs b/src/file/format/hjson.rs
index a61afef..68b9c9c 100644
--- a/src/file/format/hjson.rs
+++ b/src/file/format/hjson.rs
@@ -1,19 +1,19 @@
-use linked_hash_map::LinkedHashMap;
 use std::error::Error;
 
+use crate::map::MapImpl;
 use crate::value::{Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
     text: &str,
-) -> Result<LinkedHashMap<String, Value>, Box<dyn Error + Send + Sync>> {
+) -> Result<MapImpl<String, Value>, Box<dyn Error + Send + Sync>> {
     // Parse a JSON object value from the text
     // TODO: Have a proper error fire if the root of a file is ever not a Table
     let value = from_hjson_value(uri, &serde_hjson::from_str(text)?);
     match value.kind {
         ValueKind::Table(map) => Ok(map),
 
-        _ => Ok(LinkedHashMap::new()),
+        _ => Ok(MapImpl::new()),
     }
 }
 
@@ -30,7 +30,7 @@ fn from_hjson_value(uri: Option<&String>, value: &serde_hjson::Value) -> Value {
         serde_hjson::Value::Bool(value) => Value::new(uri, ValueKind::Boolean(value)),
 
         serde_hjson::Value::Object(ref table) => {
-            let mut m = LinkedHashMap::new();
+            let mut m = MapImpl::new();
 
             for (key, value) in table {
                 m.insert(key.clone(), from_hjson_value(uri, value));
diff --git a/src/file/format/ini.rs b/src/file/format/ini.rs
index 47f3499..b5f742d 100644
--- a/src/file/format/ini.rs
+++ b/src/file/format/ini.rs
@@ -1,20 +1,20 @@
-use linked_hash_map::LinkedHashMap;
 use std::error::Error;
 
 use ini::Ini;
 
+use crate::map::MapImpl;
 use crate::value::{Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
     text: &str,
-) -> Result<LinkedHashMap<String, Value>, Box<dyn Error + Send + Sync>> {
-    let mut map: LinkedHashMap<String, Value> = LinkedHashMap::new();
+) -> Result<MapImpl<String, Value>, Box<dyn Error + Send + Sync>> {
+    let mut map: MapImpl<String, Value> = MapImpl::new();
     let i = Ini::load_from_str(text)?;
     for (sec, prop) in i.iter() {
         match sec {
             Some(sec) => {
-                let mut sec_map: LinkedHashMap<String, Value> = LinkedHashMap::new();
+                let mut sec_map: MapImpl<String, Value> = MapImpl::new();
                 for (k, v) in prop.iter() {
                     sec_map.insert(
                         k.to_owned(),
diff --git a/src/file/format/json.rs b/src/file/format/json.rs
index a6a9443..c4895fb 100644
--- a/src/file/format/json.rs
+++ b/src/file/format/json.rs
@@ -1,19 +1,19 @@
-use linked_hash_map::LinkedHashMap;
 use std::error::Error;
 
+use crate::map::MapImpl;
 use crate::value::{Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
     text: &str,
-) -> Result<LinkedHashMap<String, Value>, Box<dyn Error + Send + Sync>> {
+) -> Result<MapImpl<String, Value>, Box<dyn Error + Send + Sync>> {
     // Parse a JSON object value from the text
     // TODO: Have a proper error fire if the root of a file is ever not a Table
     let value = from_json_value(uri, &serde_json::from_str(text)?);
     match value.kind {
         ValueKind::Table(map) => Ok(map),
 
-        _ => Ok(LinkedHashMap::new()),
+        _ => Ok(MapImpl::new()),
     }
 }
 
@@ -34,7 +34,7 @@ fn from_json_value(uri: Option<&String>, value: &serde_json::Value) -> Value {
         serde_json::Value::Bool(value) => Value::new(uri, ValueKind::Boolean(value)),
 
         serde_json::Value::Object(ref table) => {
-            let mut m = LinkedHashMap::new();
+            let mut m = MapImpl::new();
 
             for (key, value) in table {
                 m.insert(key.clone(), from_json_value(uri, value));
diff --git a/src/file/format/json5.rs b/src/file/format/json5.rs
index 952b265..69432c0 100644
--- a/src/file/format/json5.rs
+++ b/src/file/format/json5.rs
@@ -1,7 +1,7 @@
-use linked_hash_map::LinkedHashMap;
 use std::error::Error;
 
 use crate::error::{ConfigError, Unexpected};
+use crate::map::MapImpl;
 use crate::value::{Value, ValueKind};
 
 #[derive(serde::Deserialize, Debug)]
@@ -13,13 +13,13 @@ pub enum Val {
     Float(f64),
     String(String),
     Array(Vec<Val>),
-    Object(LinkedHashMap<String, Val>),
+    Object(MapImpl<String, Val>),
 }
 
 pub fn parse(
     uri: Option<&String>,
     text: &str,
-) -> Result<LinkedHashMap<String, Value>, Box<dyn Error + Send + Sync>> {
+) -> Result<MapImpl<String, Value>, Box<dyn Error + Send + Sync>> {
     match json5_rs::from_str::<Val>(text)? {
         Val::String(ref value) => Err(Unexpected::Str(value.clone())),
         Val::Integer(value) => Err(Unexpected::Integer(value)),
@@ -29,7 +29,7 @@ pub fn parse(
         Val::Null => Err(Unexpected::Unit),
         Val::Object(o) => match from_json5_value(uri, Val::Object(o)).kind {
             ValueKind::Table(map) => Ok(map),
-            _ => Ok(LinkedHashMap::new()),
+            _ => Ok(MapImpl::new()),
         },
     }
     .map_err(|err| ConfigError::invalid_root(uri, err))
diff --git a/src/file/format/mod.rs b/src/file/format/mod.rs
index 55d1c7a..df59ca6 100644
--- a/src/file/format/mod.rs
+++ b/src/file/format/mod.rs
@@ -2,9 +2,9 @@
 // BUG: ? For some reason this doesn't do anything if I try and function scope this
 #![allow(unused_mut)]
 
-use linked_hash_map::LinkedHashMap;
 use std::error::Error;
 
+use crate::map::MapImpl;
 use crate::value::Value;
 
 #[cfg(feature = "toml")]
@@ -62,8 +62,8 @@ pub enum FileFormat {
 lazy_static! {
     #[doc(hidden)]
     // #[allow(unused_mut)] ?
-    pub static ref ALL_EXTENSIONS: LinkedHashMap<FileFormat, Vec<&'static str>> = {
-        let mut formats: LinkedHashMap<FileFormat, Vec<_>> = LinkedHashMap::new();
+    pub static ref ALL_EXTENSIONS: MapImpl<FileFormat, Vec<&'static str>> = {
+        let mut formats: MapImpl<FileFormat, Vec<_>> = MapImpl::new();
 
         #[cfg(feature = "toml")]
         formats.insert(FileFormat::Toml, vec!["toml"]);
@@ -107,7 +107,7 @@ impl FileFormat {
         self,
         uri: Option<&String>,
         text: &str,
-    ) -> Result<LinkedHashMap<String, Value>, Box<dyn Error + Send + Sync>> {
+    ) -> Result<MapImpl<String, Value>, Box<dyn Error + Send + Sync>> {
         match self {
             #[cfg(feature = "toml")]
             FileFormat::Toml => toml::parse(uri, text),
diff --git a/src/file/format/ron.rs b/src/file/format/ron.rs
index a527d6f..769fd53 100644
--- a/src/file/format/ron.rs
+++ b/src/file/format/ron.rs
@@ -1,17 +1,17 @@
-use linked_hash_map::LinkedHashMap;
 use std::error::Error;
 
+use crate::map::MapImpl;
 use crate::value::{Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
     text: &str,
-) -> Result<LinkedHashMap<String, Value>, Box<dyn Error + Send + Sync>> {
+) -> Result<MapImpl<String, Value>, Box<dyn Error + Send + Sync>> {
     let value = from_ron_value(uri, ron::from_str(text)?)?;
     match value.kind {
         ValueKind::Table(map) => Ok(map),
 
-        _ => Ok(LinkedHashMap::new()),
+        _ => Ok(MapImpl::new()),
     }
 }
 
@@ -56,7 +56,7 @@ fn from_ron_value(
 
                     Ok((key, value))
                 })
-                .collect::<Result<LinkedHashMap<_, _>, _>>()?;
+                .collect::<Result<MapImpl<_, _>, _>>()?;
 
             ValueKind::Table(map)
         }
diff --git a/src/file/format/toml.rs b/src/file/format/toml.rs
index 5468d97..a4e16b2 100644
--- a/src/file/format/toml.rs
+++ b/src/file/format/toml.rs
@@ -1,19 +1,19 @@
-use linked_hash_map::LinkedHashMap;
 use std::error::Error;
 
+use crate::map::MapImpl;
 use crate::value::{Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
     text: &str,
-) -> Result<LinkedHashMap<String, Value>, Box<dyn Error + Send + Sync>> {
+) -> Result<MapImpl<String, Value>, Box<dyn Error + Send + Sync>> {
     // Parse a TOML value from the provided text
     // TODO: Have a proper error fire if the root of a file is ever not a Table
     let value = from_toml_value(uri, &toml::from_str(text)?);
     match value.kind {
         ValueKind::Table(map) => Ok(map),
 
-        _ => Ok(LinkedHashMap::new()),
+        _ => Ok(MapImpl::new()),
     }
 }
 
@@ -25,7 +25,7 @@ fn from_toml_value(uri: Option<&String>, value: &toml::Value) -> Value {
         toml::Value::Boolean(value) => Value::new(uri, value),
 
         toml::Value::Table(ref table) => {
-            let mut m = LinkedHashMap::new();
+            let mut m = MapImpl::new();
 
             for (key, value) in table {
                 m.insert(key.clone(), from_toml_value(uri, value));
diff --git a/src/file/format/yaml.rs b/src/file/format/yaml.rs
index 246758a..f725b1f 100644
--- a/src/file/format/yaml.rs
+++ b/src/file/format/yaml.rs
@@ -1,16 +1,16 @@
-use linked_hash_map::LinkedHashMap;
 use std::error::Error;
 use std::fmt;
 use std::mem;
 
 use yaml_rust as yaml;
 
+use crate::map::MapImpl;
 use crate::value::{Value, ValueKind};
 
 pub fn parse(
     uri: Option<&String>,
     text: &str,
-) -> Result<LinkedHashMap<String, Value>, Box<dyn Error + Send + Sync>> {
+) -> Result<MapImpl<String, Value>, Box<dyn Error + Send + Sync>> {
     // Parse a YAML object from file
     let mut docs = yaml::YamlLoader::load_from_str(text)?;
     let root = match docs.len() {
@@ -26,7 +26,7 @@ pub fn parse(
     match value.kind {
         ValueKind::Table(map) => Ok(map),
 
-        _ => Ok(LinkedHashMap::new()),
+        _ => Ok(MapImpl::new()),
     }
 }
 
@@ -40,7 +40,7 @@ fn from_yaml_value(uri: Option<&String>, value: &yaml::Yaml) -> Value {
         yaml::Yaml::Integer(value) => Value::new(uri, ValueKind::Integer(value)),
         yaml::Yaml::Boolean(value) => Value::new(uri, ValueKind::Boolean(value)),
         yaml::Yaml::Hash(ref table) => {
-            let mut m = LinkedHashMap::new();
+            let mut m = MapImpl::new();
             for (key, value) in table {
                 if let Some(k) = key.as_str() {
                     m.insert(k.to_owned(), from_yaml_value(uri, value));
diff --git a/src/file/mod.rs b/src/file/mod.rs
index 02fd51f..d5744f4 100644
--- a/src/file/mod.rs
+++ b/src/file/mod.rs
@@ -1,10 +1,10 @@
 mod format;
 pub mod source;
 
-use linked_hash_map::LinkedHashMap;
 use std::path::{Path, PathBuf};
 
 use crate::error::*;
+use crate::map::MapImpl;
 use crate::source::Source;
 use crate::value::Value;
 
@@ -99,7 +99,7 @@ where
         Box::new((*self).clone())
     }
 
-    fn collect(&self) -> Result<LinkedHashMap<String, Value>> {
+    fn collect(&self) -> Result<MapImpl<String, Value>> {
         // Coerce the file contents to a string
         let (uri, contents, format) = match self
             .source
@@ -110,7 +110,7 @@ where
 
             Err(error) => {
                 if !self.required {
-                    return Ok(LinkedHashMap::new());
+                    return Ok(MapImpl::new());
                 }
 
                 return Err(error);
diff --git a/src/lib.rs b/src/lib.rs
index 87c82bc..511ddd8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -59,6 +59,7 @@ mod de;
 mod env;
 mod error;
 mod file;
+mod map;
 mod path;
 mod ser;
 mod source;
@@ -70,6 +71,7 @@ pub use crate::config::Config;
 pub use crate::env::Environment;
 pub use crate::error::ConfigError;
 pub use crate::file::{File, FileFormat, FileSourceFile, FileSourceString};
+pub use crate::map::MapImpl;
 pub use crate::source::AsyncSource;
 pub use crate::source::Source;
 pub use crate::value::Value;
diff --git a/src/map.rs b/src/map.rs
new file mode 100644
index 0000000..ae41155
--- /dev/null
+++ b/src/map.rs
@@ -0,0 +1,4 @@
+#[cfg(not(feature = "preserve_order"))]
+pub type MapImpl<K, V> = std::collections::HashMap<K, V>;
+#[cfg(feature = "preserve_order")]
+pub type MapImpl<K, V> = linked_hash_map::LinkedHashMap<K, V>;
diff --git a/src/path/mod.rs b/src/path/mod.rs
index b056467..8ce51f9 100644
--- a/src/path/mod.rs
+++ b/src/path/mod.rs
@@ -1,7 +1,7 @@
-use linked_hash_map::LinkedHashMap;
 use std::str::FromStr;
 
 use crate::error::*;
+use crate::map::MapImpl;
 use crate::value::{Value, ValueKind};
 
 mod parser;
@@ -135,7 +135,7 @@ impl Expression {
                     ),
 
                     _ => {
-                        *value = LinkedHashMap::<String, Value>::new().into();
+                        *value = MapImpl::<String, Value>::new().into();
 
                         if let ValueKind::Table(ref mut map) = value.kind {
                             Some(
@@ -186,7 +186,7 @@ impl Expression {
                     ValueKind::Table(_) => {}
 
                     _ => {
-                        *root = LinkedHashMap::<String, Value>::new().into();
+                        *root = MapImpl::<String, Value>::new().into();
                     }
                 }
 
@@ -195,7 +195,7 @@ impl Expression {
                         // Pull out another table
                         let mut target = if let ValueKind::Table(ref mut map) = root.kind {
                             map.entry(id.clone())
-                                .or_insert_with(|| LinkedHashMap::<String, Value>::new().into())
+                                .or_insert_with(|| MapImpl::<String, Value>::new().into())
                         } else {
                             unreachable!();
                         };
@@ -228,7 +228,7 @@ impl Expression {
 
                         _ => {
                             // Didn't find a table. Oh well. Make a table and do this anyway
-                            *parent = LinkedHashMap::<String, Value>::new().into();
+                            *parent = MapImpl::<String, Value>::new().into();
 
                             Expression::Identifier(key.clone()).set(parent, value);
                         }
diff --git a/src/source.rs b/src/source.rs
index 7d257d0..2c76366 100644
--- a/src/source.rs
+++ b/src/source.rs
@@ -1,10 +1,10 @@
-use linked_hash_map::LinkedHashMap;
 use std::fmt::Debug;
 use std::str::FromStr;
 
 use async_trait::async_trait;
 
 use crate::error::*;
+use crate::map::MapImpl;
 use crate::path;
 use crate::value::{Value, ValueKind};
 
@@ -13,8 +13,8 @@ pub trait Source: Debug {
     fn clone_into_box(&self) -> Box<dyn Source + Send + Sync>;
 
     /// Collect all configuration properties available from this source and return
-    /// a LinkedHashMap.
-    fn collect(&self) -> Result<LinkedHashMap<String, Value>>;
+    /// a MapImpl.
+    fn collect(&self) -> Result<MapImpl<String, Value>>;
 
     /// Collects all configuration properties to a provided cache.
     fn collect_to(&self, cache: &mut Value) -> Result<()> {
@@ -55,8 +55,8 @@ pub trait AsyncSource: Debug + Sync {
     // Sync is supertrait due to https://docs.rs/async-trait/0.1.50/async_trait/index.html#dyn-traits
 
     /// Collects all configuration properties available from this source and return
-    /// a LinkedHashMap as an async operations.
-    async fn collect(&self) -> Result<LinkedHashMap<String, Value>>;
+    /// a MapImpl as an async operations.
+    async fn collect(&self) -> Result<MapImpl<String, Value>>;
 
     /// Collects all configuration properties to a provided cache.
     async fn collect_to(&self, cache: &mut Value) -> Result<()> {
@@ -86,8 +86,8 @@ impl Source for Vec<Box<dyn Source + Send + Sync>> {
         Box::new((*self).clone())
     }
 
-    fn collect(&self) -> Result<LinkedHashMap<String, Value>> {
-        let mut cache: Value = LinkedHashMap::<String, Value>::new().into();
+    fn collect(&self) -> Result<MapImpl<String, Value>> {
+        let mut cache: Value = MapImpl::<String, Value>::new().into();
 
         for source in self {
             source.collect_to(&mut cache)?;
@@ -106,8 +106,8 @@ impl Source for [Box<dyn Source + Send + Sync>] {
         Box::new(self.to_owned())
     }
 
-    fn collect(&self) -> Result<LinkedHashMap<String, Value>> {
-        let mut cache: Value = LinkedHashMap::<String, Value>::new().into();
+    fn collect(&self) -> Result<MapImpl<String, Value>> {
+        let mut cache: Value = MapImpl::<String, Value>::new().into();
 
         for source in self {
             source.collect_to(&mut cache)?;
@@ -131,8 +131,8 @@ where
         Box::new((*self).clone())
     }
 
-    fn collect(&self) -> Result<LinkedHashMap<String, Value>> {
-        let mut cache: Value = LinkedHashMap::<String, Value>::new().into();
+    fn collect(&self) -> Result<MapImpl<String, Value>> {
+        let mut cache: Value = MapImpl::<String, Value>::new().into();
 
         for source in self {
             source.collect_to(&mut cache)?;
diff --git a/src/value.rs b/src/value.rs
index e8f41c9..17be54d 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -1,10 +1,10 @@
-use linked_hash_map::LinkedHashMap;
 use std::fmt;
 use std::fmt::Display;
 
 use serde::de::{Deserialize, Deserializer, Visitor};
 
 use crate::error::*;
+use crate::map::MapImpl;
 
 /// Underlying kind of the configuration value.
 ///
@@ -23,7 +23,7 @@ pub enum ValueKind {
 }
 
 pub type Array = Vec<Value>;
-pub type Table = LinkedHashMap<String, Value>;
+pub type Table = MapImpl<String, Value>;
 
 impl Default for ValueKind {
     fn default() -> Self {
@@ -73,11 +73,11 @@ impl From<bool> for ValueKind {
     }
 }
 
-impl<T> From<LinkedHashMap<String, T>> for ValueKind
+impl<T> From<MapImpl<String, T>> for ValueKind
 where
     T: Into<Value>,
 {
-    fn from(values: LinkedHashMap<String, T>) -> Self {
+    fn from(values: MapImpl<String, T>) -> Self {
         let t = values.into_iter().map(|(k, v)| (k, v.into())).collect();
         ValueKind::Table(t)
     }
@@ -357,7 +357,7 @@ impl Value {
 
     /// If the `Value` is a Table, returns the associated Map.
     // FIXME: Should this not be `try_into_*` ?
-    pub fn into_table(self) -> Result<LinkedHashMap<String, Value>> {
+    pub fn into_table(self) -> Result<MapImpl<String, Value>> {
         match self.kind {
             ValueKind::Table(value) => Ok(value),