use mem::take where possible (#1507)

src/app_service.rs

@@ -12,7 +12,7 @@ use actix_service::{fn_service, Service, ServiceFactory};
 use futures::future::{join_all, ok, FutureExt, LocalBoxFuture};
 
 use crate::config::{AppConfig, AppService};
-use crate::data::{FnDataFactory, DataFactory};
+use crate::data::{DataFactory, FnDataFactory};
 use crate::error::Error;
 use crate::guard::Guard;
 use crate::request::{HttpRequest, HttpRequestPool};
@@ -76,7 +76,7 @@ where
         let mut config = AppService::new(config, default.clone(), self.data.clone());
 
         // register services
-        std::mem::replace(&mut *self.services.borrow_mut(), Vec::new())
+        std::mem::take(&mut *self.services.borrow_mut())
             .into_iter()
             .for_each(|mut srv| srv.register(&mut config));
 
@@ -99,7 +99,7 @@ where
         });
 
         // external resources
-        for mut rdef in std::mem::replace(&mut *self.external.borrow_mut(), Vec::new()) {
+        for mut rdef in std::mem::take(&mut *self.external.borrow_mut()) {
             rmap.add(&mut rdef, None);
         }
 

src/resource.rs

@@ -379,7 +379,7 @@ where
         let guards = if self.guards.is_empty() {
             None
         } else {
-            Some(std::mem::replace(&mut self.guards, Vec::new()))
+            Some(std::mem::take(&mut self.guards))
         };
         let mut rdef = if config.is_root() || !self.rdef.is_empty() {
             ResourceDef::new(insert_slash(self.rdef.clone()))

src/route.rs

@@ -56,7 +56,7 @@ impl Route {
     }
 
     pub(crate) fn take_guards(&mut self) -> Vec<Box<dyn Guard>> {
-        std::mem::replace(Rc::get_mut(&mut self.guards).unwrap(), Vec::new())
+        std::mem::take(Rc::get_mut(&mut self.guards).unwrap())
     }
 }
 

src/scope.rs

@@ -429,7 +429,7 @@ where
         let mut rmap = ResourceMap::new(ResourceDef::root_prefix(&self.rdef));
 
         // external resources
-        for mut rdef in std::mem::replace(&mut self.external, Vec::new()) {
+        for mut rdef in std::mem::take(&mut self.external) {
             rmap.add(&mut rdef, None);
         }
 

src/service.rs

@@ -515,7 +515,7 @@ where
         let guards = if self.guards.is_empty() {
             None
         } else {
-            Some(std::mem::replace(&mut self.guards, Vec::new()))
+            Some(std::mem::take(&mut self.guards))
         };
 
         let mut rdef = if config.is_root() || !self.rdef.is_empty() {