From 4357840e95f3646494ddeea4aae12425dfab2db8 Mon Sep 17 00:00:00 2001
From: Ryan Leckey <ryan@launchbadge.com>
Date: Thu, 1 Jun 2017 22:06:50 -0700
Subject: Handle Option<T> in deserializer

---
 lib/src/config.rs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'lib/src/config.rs')

diff --git a/lib/src/config.rs b/lib/src/config.rs
index 0767f87..93d7fc0 100644
--- a/lib/src/config.rs
+++ b/lib/src/config.rs
@@ -43,7 +43,8 @@ pub struct Config {
 impl Config {
     /// Merge in a configuration property source.
     pub fn merge<T>(&mut self, source: T) -> Result<()>
-        where T: 'static, T: Source + Send + Sync
+        where T: 'static,
+              T: Source + Send + Sync
     {
         match self.kind {
             ConfigKind::Mutable { ref mut sources, .. } => {
@@ -65,14 +66,12 @@ impl Config {
     /// operation (`set`, `merge`, `set_default`, etc.).
     pub fn refresh(&mut self) -> Result<()> {
         self.cache = match self.kind {
-            ConfigKind::Mutable { ref overrides, ref sources, ref defaults } => {
-                let mut cache = Value::new(None, HashMap::<String, Value>::new());
-
-                // HACK!
-                cache = sources[0].collect()?;
-
-                cache
-            }
+            // TODO: We need to actually merge in all the stuff
+            ConfigKind::Mutable {
+                ref overrides,
+                ref sources,
+                ref defaults,
+            } => sources[0].collect()?,
 
             ConfigKind::Frozen => {
                 return Err(ConfigError::Frozen);
@@ -95,9 +94,7 @@ impl Config {
                 T::deserialize(value)
             }
 
-            None => {
-                Err(ConfigError::NotFound(key.into()))
-            }
+            None => Err(ConfigError::NotFound(key.into())),
         }
     }
 }
-- 
cgit v1.2.3