From 972de9497e16de8daf3a3790feb8e2935ecf72ec Mon Sep 17 00:00:00 2001
From: Denys Vitali <denys@denv.it>
Date: Mon, 3 Jun 2019 10:36:09 +0200
Subject: [PATCH] ScopeConfig: Remove unnecessary changes, handle the case when
 data is empty

---
 src/scope.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/scope.rs b/src/scope.rs
index 846d32d6e..e9b60c6e3 100644
--- a/src/scope.rs
+++ b/src/scope.rs
@@ -124,16 +124,13 @@ impl Scope {
         self.services.extend(cfg.services);
 
         if !cfg.data.is_empty() {
-            if (&self).data.is_some() {
+            let mut data = self.data.unwrap_or(Extensions::new());
 
-                let mut data = self.data.unwrap();
-
-                for value in cfg.data.iter() {
-                    value.create(&mut data);
-                }
-
-                self.data = Some(data);
+            for value in cfg.data.iter() {
+                value.create(&mut data);
             }
+
+            self.data = Some(data);
         }
         self
     }