ExecutableProvider::exec now consumes self to allow nested types to move content out of RemoteProvider

Author: petehayes102

core/src/lib.rs

@@ -30,9 +30,9 @@ use errors::*;
 use erased_serde::Serialize;
 
 pub trait ExecutableProvider<'de>: serde::Serialize + serde::Deserialize<'de> {
-    // It'd be nice to return Result<Serialize> here someday...
+    // @todo It'd be nice to return Result<Serialize> here someday...
     // See https://github.com/rust-lang/rfcs/issues/518.
-    fn exec(&self, &host::Host) -> Result<Box<Serialize>>;
+    fn exec(self, &host::Host) -> Result<Box<Serialize>>;
 }
 
 #[derive(Serialize, Deserialize)]
@@ -41,9 +41,9 @@ pub enum RemoteProvider {
 }
 
 impl <'de>ExecutableProvider<'de> for RemoteProvider {
-    fn exec(&self, host: &host::Host) -> Result<Box<Serialize>> {
-        match *self {
-            RemoteProvider::Telemetry(ref p) => p.exec(host)
+    fn exec(self, host: &host::Host) -> Result<Box<Serialize>> {
+        match self {
+            RemoteProvider::Telemetry(p) => p.exec(host)
         }
     }
 }

core/src/telemetry/mod.rs

@@ -32,12 +32,12 @@ pub enum RemoteProvider {
 }
 
 impl <'de>ExecutableProvider<'de> for RemoteProvider {
-    fn exec(&self, host: &Host) -> Result<Box<Serialize>> {
-        match *self {
-            RemoteProvider::Centos(ref p) => p.exec(host),
-            RemoteProvider::Debian(ref p) => p.exec(host),
-            RemoteProvider::Freebsd(ref p) => p.exec(host),
-            RemoteProvider::Macos(ref p) => p.exec(host)
+    fn exec(self, host: &Host) -> Result<Box<Serialize>> {
+        match self {
+            RemoteProvider::Centos(p) => p.exec(host),
+            RemoteProvider::Debian(p) => p.exec(host),
+            RemoteProvider::Freebsd(p) => p.exec(host),
+            RemoteProvider::Macos(p) => p.exec(host)
         }
     }
 }

core/src/telemetry/providers/centos.rs

@@ -22,8 +22,8 @@ pub enum RemoteProvider {
 }
 
 impl <'de>ExecutableProvider<'de> for RemoteProvider {
-    fn exec(&self, host: &Host) -> Result<Box<Serialize>> {
-        match *self {
+    fn exec(self, host: &Host) -> Result<Box<Serialize>> {
+        match self {
             RemoteProvider::Available => Ok(Box::new(Centos::available(host))),
             RemoteProvider::Load => {
                 let t: serializable::Telemetry = Centos::load(host)?.into();

core/src/telemetry/providers/debian.rs

@@ -22,8 +22,8 @@ pub enum RemoteProvider {
 }
 
 impl <'de>ExecutableProvider<'de> for RemoteProvider {
-    fn exec(&self, host: &Host) -> Result<Box<Serialize>> {
-        match *self {
+    fn exec(self, host: &Host) -> Result<Box<Serialize>> {
+        match self {
             RemoteProvider::Available => Ok(Box::new(Debian::available(host))),
             RemoteProvider::Load => {
                 let t: serializable::Telemetry = Debian::load(host)?.into();

core/src/telemetry/providers/freebsd.rs

@@ -24,8 +24,8 @@ pub enum RemoteProvider {
 }
 
 impl <'de>ExecutableProvider<'de> for RemoteProvider {
-    fn exec(&self, host: &Host) -> Result<Box<Serialize>> {
-        match *self {
+    fn exec(self, host: &Host) -> Result<Box<Serialize>> {
+        match self {
             RemoteProvider::Available => Ok(Box::new(Freebsd::available(host))),
             RemoteProvider::Load => {
                 let t: serializable::Telemetry = Freebsd::load(host)?.into();

core/src/telemetry/providers/macos.rs

@@ -22,8 +22,8 @@ pub enum RemoteProvider {
 }
 
 impl <'de>ExecutableProvider<'de> for RemoteProvider {
-    fn exec(&self, host: &Host) -> Result<Box<Serialize>> {
-        match *self {
+    fn exec(self, host: &Host) -> Result<Box<Serialize>> {
+        match self {
             RemoteProvider::Available => Ok(Box::new(Macos::available(host))),
             RemoteProvider::Load => {
                 let t: serializable::Telemetry = Macos::load(host)?.into();