Move order preservation under a feature gate

Author: David Orchard

Cargo.toml

@@ -21,21 +21,22 @@ yaml = ["yaml-rust"]
 hjson = ["serde-hjson"]
 ini = ["rust-ini"]
 json5 = ["json5_rs"]
+preserve_order = ["linked-hash-map", "toml/preserve_order", "serde_json/preserve_order", "ron/indexmap"]
 
 [dependencies]
 async-trait = "0.1.50"
 lazy_static = "1.0"
 serde = "1.0.8"
 nom = "6"
 
-toml = { version = "0.5", features = ["preserve_order"], optional = true }
-serde_json = { version = "1.0.2", features = ["std", "preserve_order"], optional = true }
+toml = { version = "0.5", optional = true }
+serde_json = { version = "1.0.2", optional = true }
 yaml-rust = { version = "0.4", optional = true }
 serde-hjson = { version = "0.9", default-features = false, optional = true }
 rust-ini = { version = "0.17", optional = true }
-ron = { version = "0.6", features = ["indexmap"], optional = true }
+ron = { version = "0.6", optional = true }
 json5_rs = { version = "0.3", optional = true, package = "json5" }
-linked-hash-map = { version = "0.5.4", features = ["serde_impl"] }
+linked-hash-map = { version = "0.5.4", optional = true, features = ["serde_impl"] }
 
 [dev-dependencies]
 serde_derive = "1.0.8"
@@ -45,3 +46,6 @@ tokio = { version = "1", features = ["rt-multi-thread", "macros", "fs", "io-util
 warp = "0.3.1"
 futures = "0.3.15"
 reqwest = "0.11.3"
+# Workaround to activate non-default features for tests:
+# https://github.com/rust-lang/cargo/issues/2911
+config = { path = ".", features = ["preserve_order"] }

examples/async_source/main.rs

@@ -1,7 +1,6 @@
-use linked_hash_map::LinkedHashMap;
 use std::error::Error;
 
-use config::{builder::AsyncState, AsyncSource, ConfigBuilder, ConfigError, FileFormat};
+use config::{builder::AsyncState, AsyncSource, ConfigBuilder, ConfigError, FileFormat, MapImpl};
 
 use async_trait::async_trait;
 use futures::{select, FutureExt};
@@ -57,7 +56,7 @@ struct HttpSource {
 
 #[async_trait]
 impl AsyncSource for HttpSource {
-    async fn collect(&self) -> Result<LinkedHashMap<String, config::Value>, ConfigError> {
+    async fn collect(&self) -> Result<MapImpl<String, config::Value>, ConfigError> {
         reqwest::get(&self.uri)
             .await
             .map_err(|e| ConfigError::Foreign(Box::new(e)))? // error conversion is possible from custom AsyncSource impls

examples/glob/src/main.rs

@@ -1,5 +1,5 @@
 use std::path::Path;
-use std::collections::LinkedHashMap;
+use std::collections::MapImpl;
 use config::*;
 use glob::glob;
 
@@ -14,9 +14,9 @@ fn main() {
         .merge(File::from(Path::new("conf/05-some.yml"))).unwrap()
         .merge(File::from(Path::new("conf/99-extra.json"))).unwrap();
 
-    // Print out our settings (as a LinkedHashMap)
+    // Print out our settings (as a MapImpl)
     println!("\n{:?} \n\n-----------",
-             settings.try_into::<LinkedHashMap<String, String>>().unwrap());
+             settings.try_into::<MapImpl<String, String>>().unwrap());
 
     // Option 2
     // --------
@@ -28,9 +28,9 @@ fn main() {
                     File::from(Path::new("conf/99-extra.json"))])
         .unwrap();
 
-    // Print out our settings (as a LinkedHashMap)
+    // Print out our settings (as a MapImpl)
     println!("\n{:?} \n\n-----------",
-             settings.try_into::<LinkedHashMap<String, String>>().unwrap());
+             settings.try_into::<MapImpl<String, String>>().unwrap());
 
     // Option 3
     // --------
@@ -43,7 +43,7 @@ fn main() {
                    .collect::<Vec<_>>())
         .unwrap();
 
-    // Print out our settings (as a LinkedHashMap)
+    // Print out our settings (as a MapImpl)
     println!("\n{:?} \n\n-----------",
-             settings.try_into::<LinkedHashMap<String, String>>().unwrap());
+             settings.try_into::<MapImpl<String, String>>().unwrap());
 }

examples/simple/src/main.rs

@@ -1,4 +1,4 @@
-use std::collections::LinkedHashMap;
+use std::collections::MapImpl;
 
 fn main() {
     let mut settings = config::Config::default();
@@ -9,7 +9,7 @@ fn main() {
         // Eg.. `APP_DEBUG=1 ./target/app` would set the `debug` key
         .merge(config::Environment::with_prefix("APP")).unwrap();
 
-    // Print out our settings (as a LinkedHashMap)
+    // Print out our settings (as a MapImpl)
     println!("{:?}",
-             settings.try_into::<LinkedHashMap<String, String>>().unwrap());
+             settings.try_into::<MapImpl<String, String>>().unwrap());
 }

examples/watch/src/main.rs

@@ -1,5 +1,5 @@
 use config::*;
-use std::collections::LinkedHashMap;
+use std::collections::MapImpl;
 use std::sync::RwLock;
 use notify::{RecommendedWatcher, DebouncedEvent, Watcher, RecursiveMode};
 use std::sync::mpsc::channel;
@@ -20,7 +20,7 @@ fn show() {
                  .read()
                  .unwrap()
                  .clone()
-                 .try_into::<LinkedHashMap<String, String>>()
+                 .try_into::<MapImpl<String, String>>()
                  .unwrap());
 }
 

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() {

src/config.rs

@@ -1,11 +1,11 @@
-use linked_hash_map::LinkedHashMap;
 use std::fmt::Debug;
 
 use crate::builder::{ConfigBuilder, DefaultState};
 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()
     }
 }

src/de.rs

@@ -1,11 +1,11 @@
-use linked_hash_map::LinkedHashMap;
 use std::collections::VecDeque;
 use std::iter::Enumerate;
 
 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(),
         }

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("");

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));