Ported Telemetry from rustc-serialize to serde

Author: petehayes102

src/host/telemetry.rs

@@ -15,7 +15,7 @@ use target::Target;
 #[cfg(feature = "local-run")]
 
 #[cfg(feature = "local-run")]
-#[derive(Debug, RustcEncodable)]
+#[derive(Debug, Serialize)]
 pub struct Telemetry {
     pub cpu: Cpu,
     pub fs: Vec<FsMount>,
@@ -55,70 +55,14 @@ impl Telemetry {
     pub fn init(host: &mut Host) -> Result<Value> {
         Ok(try!(Target::telemetry_init(host)))
     }
-
-    // XXX While Macros 1.1 are unstable, we can't use Serde to
-    // convert Telemetry => Value, so we have to roll our own.
-    // (https://github.com/rust-lang/rust/issues/35900)
-    #[cfg(feature = "local-run")]
-    pub fn into_value(self) -> Value {
-        let mut cpu: Map<String, Value> = Map::new();
-        cpu.insert("vendor".into(), json!(self.cpu.vendor));
-        cpu.insert("brand_string".into(), json!(self.cpu.brand_string));
-        cpu.insert("cores".into(), json!(self.cpu.cores));
-
-        let mut fs = Vec::new();
-        for mount in self.fs {
-            let mut map: Map<String, Value> = Map::new();
-            map.insert("filesystem".into(), json!(mount.filesystem));
-            map.insert("mountpoint".into(), json!(mount.mountpoint));
-            map.insert("size".into(), json!(mount.size));
-            map.insert("used".into(), json!(mount.used));
-            map.insert("available".into(), json!(mount.available));
-            map.insert("capacity".into(), json!(mount.capacity));
-            fs.push(map);
-        }
-
-        let mut net = Vec::new();
-        for netif in self.net {
-            let mut map: Map<String, Value> = Map::new();
-            map.insert("name".into(), json!(netif.name));
-            map.insert("index".into(), json!(netif.index));
-            if let Some(mac) = netif.mac {
-                map.insert("mac".into(), json!(mac));
-            }
-            if let Some(ips) = netif.ips {
-                map.insert("ips".into(), json!(ips));
-            }
-            map.insert("flags".into(), json!(netif.flags));
-            net.push(map);
-        }
-
-        let mut os: Map<String, Value> = Map::new();
-        os.insert("arch".into(), json!(self.os.arch));
-        os.insert("family".into(), json!(self.os.family));
-        os.insert("platform".into(), json!(self.os.platform));
-        os.insert("version_str".into(), json!(self.os.version_str));
-        os.insert("version_maj".into(), json!(self.os.version_maj));
-        os.insert("version_min".into(), json!(self.os.version_min));
-        os.insert("version_patch".into(), json!(self.os.version_patch));
-
-        let mut telemetry: Map<String, Value> = Map::new();
-        telemetry.insert("cpu".into(), json!(cpu));
-        telemetry.insert("fs".into(), json!(fs));
-        telemetry.insert("hostname".into(), json!(self.hostname));
-        telemetry.insert("memory".into(), json!(self.memory));
-        telemetry.insert("net".into(), json!(net));
-        telemetry.insert("os".into(), json!(os));
-        json!(telemetry)
-    }
 }
 
 pub trait TelemetryTarget {
     fn telemetry_init(host: &mut Host) -> Result<Value>;
 }
 
 #[cfg(feature = "local-run")]
-#[derive(Debug, RustcEncodable)]
+#[derive(Debug, Serialize)]
 pub struct Cpu {
     pub vendor: String,
     pub brand_string: String,
@@ -137,7 +81,7 @@ impl Cpu {
 }
 
 #[cfg(feature = "local-run")]
-#[derive(Debug, RustcEncodable)]
+#[derive(Debug, Serialize)]
 pub struct FsMount {
     pub filesystem: String,
     pub mountpoint: String,
@@ -148,7 +92,7 @@ pub struct FsMount {
 }
 
 #[cfg(feature = "local-run")]
-#[derive(Debug, RustcEncodable)]
+#[derive(Debug, Serialize)]
 pub struct Netif {
     pub name: String,
     pub index: u32,
@@ -158,7 +102,7 @@ pub struct Netif {
 }
 
 #[cfg(feature = "local-run")]
-#[derive(Debug, RustcEncodable)]
+#[derive(Debug, Serialize)]
 pub struct Os {
     pub arch: String,
     pub family: String,

src/target/centos.rs

@@ -13,7 +13,7 @@ use file::{FileTarget, FileOwner};
 use host::Host;
 use package::PackageTarget;
 use package::providers::Providers;
-use serde_json::Value;
+use serde_json;
 use service::ServiceTarget;
 use std::env;
 use std::path::Path;
@@ -166,7 +166,7 @@ impl ServiceTarget for CentosTarget {
 
 impl TelemetryTarget for CentosTarget {
     #[allow(unused_variables)]
-    fn telemetry_init(host: &mut Host) -> Result<Value> {
+    fn telemetry_init(host: &mut Host) -> Result<serde_json::Value> {
         let cpu_vendor = try!(linux::cpu_vendor());
         let cpu_brand = try!(linux::cpu_brand_string());
         let hostname = try!(default::hostname());
@@ -193,6 +193,6 @@ impl TelemetryTarget for CentosTarget {
             ),
         );
 
-        Ok(telemetry.into_value())
+        Ok(serde_json::to_value(telemetry)?)
     }
 }

src/target/debian.rs

@@ -14,7 +14,7 @@ use host::Host;
 use host::telemetry::{Cpu, Os, Telemetry, TelemetryTarget};
 use package::PackageTarget;
 use package::providers::Providers;
-use serde_json::Value;
+use serde_json;
 use service::ServiceTarget;
 use std::{env, str};
 use std::path::Path;
@@ -167,7 +167,7 @@ impl ServiceTarget for DebianTarget {
 
 impl TelemetryTarget for DebianTarget {
     #[allow(unused_variables)]
-    fn telemetry_init(host: &mut Host) -> Result<Value> {
+    fn telemetry_init(host: &mut Host) -> Result<serde_json::Value> {
         let cpu_vendor = try!(linux::cpu_vendor());
         let cpu_brand = try!(linux::cpu_brand_string());
         let hostname = try!(default::hostname());
@@ -186,7 +186,7 @@ impl TelemetryTarget for DebianTarget {
             Os::new(env::consts::ARCH, "debian", "debian", &version_str, version_maj, version_min, 0), // No known patch version
         );
 
-        Ok(telemetry.into_value())
+        Ok(serde_json::to_value(telemetry)?)
     }
 }
 

src/target/fedora.rs

@@ -13,7 +13,7 @@ use file::{FileTarget, FileOwner};
 use host::Host;
 use package::PackageTarget;
 use package::providers::Providers;
-use serde_json::Value;
+use serde_json;
 use service::ServiceTarget;
 use std::env;
 use std::path::Path;
@@ -166,7 +166,7 @@ impl ServiceTarget for FedoraTarget {
 
 impl TelemetryTarget for FedoraTarget {
     #[allow(unused_variables)]
-    fn telemetry_init(host: &mut Host) -> Result<Value> {
+    fn telemetry_init(host: &mut Host) -> Result<serde_json::Value> {
         let cpu_vendor = try!(linux::cpu_vendor());
         let cpu_brand = try!(linux::cpu_brand_string());
         let hostname = try!(default::hostname());
@@ -193,6 +193,6 @@ impl TelemetryTarget for FedoraTarget {
             ),
         );
 
-        Ok(telemetry.into_value())
+        Ok(serde_json::to_value(telemetry)?)
     }
 }

src/target/freebsd.rs

@@ -15,7 +15,7 @@ use host::telemetry::{Cpu, Os, Telemetry, TelemetryTarget};
 use package::PackageTarget;
 use package::providers::Providers;
 use regex::Regex;
-use serde_json::Value;
+use serde_json;
 use service::ServiceTarget;
 use std::env;
 use std::fs::{File, OpenOptions};
@@ -206,7 +206,7 @@ impl ServiceTarget for Target {
 
 impl TelemetryTarget for Target {
     #[allow(unused_variables)]
-    fn telemetry_init(host: &mut Host) -> Result<Value> {
+    fn telemetry_init(host: &mut Host) -> Result<serde_json::Value> {
         let cpu_vendor = try!(telemetry_cpu_vendor());
         let cpu_brand = try!(unix::get_sysctl_item("hw\\.model"));
         let hostname = try!(default::hostname());
@@ -225,7 +225,7 @@ impl TelemetryTarget for Target {
             Os::new(env::consts::ARCH, "unix", "freebsd", &version_str, version_maj, version_min, 0),
         );
 
-        Ok(telemetry.into_value())
+        Ok(serde_json::to_value(telemetry)?)
     }
 }
 

src/target/macos.rs

@@ -14,7 +14,7 @@ use host::Host;
 use host::telemetry::{Cpu, Os, Telemetry, TelemetryTarget};
 use package::PackageTarget;
 use package::providers::Providers;
-use serde_json::Value;
+use serde_json;
 use service::ServiceTarget;
 use std::{env, process, str};
 use std::path::Path;
@@ -197,7 +197,7 @@ impl ServiceTarget for Target {
 
 impl TelemetryTarget for Target {
     #[allow(unused_variables)]
-    fn telemetry_init(host: &mut Host) -> Result<Value> {
+    fn telemetry_init(host: &mut Host) -> Result<serde_json::Value> {
         let cpu_vendor = try!(unix::get_sysctl_item("machdep\\.cpu\\.vendor"));
         let cpu_brand = try!(unix::get_sysctl_item("machdep\\.cpu\\.brand_string"));
         let hostname = try!(default::hostname());
@@ -226,7 +226,7 @@ impl TelemetryTarget for Target {
             Os::new(env::consts::ARCH, "unix", "macos", &version_str, version_maj, version_min, version_patch),
         );
 
-        Ok(telemetry.into_value())
+        Ok(serde_json::to_value(telemetry)?)
     }
 }
 

src/target/nixos.rs

@@ -13,7 +13,7 @@ use file::{FileTarget, FileOwner};
 use host::Host;
 use package::PackageTarget;
 use package::providers::Providers;
-use serde_json::Value;
+use serde_json;
 use service::ServiceTarget;
 use std::{env, process, str};
 use std::path::Path;
@@ -162,7 +162,7 @@ impl ServiceTarget for NixOsTarget {
 
 impl TelemetryTarget for NixOsTarget {
     #[allow(unused_variables)]
-    fn telemetry_init(host: &mut Host) -> Result<Value> {
+    fn telemetry_init(host: &mut Host) -> Result<serde_json::Value> {
         let cpu_vendor = try!(linux::cpu_vendor());
         let cpu_brand = try!(linux::cpu_brand_string());
         let hostname = try!(default::hostname());
@@ -189,7 +189,7 @@ impl TelemetryTarget for NixOsTarget {
             ),
         );
 
-        Ok(telemetry.into_value())
+        Ok(serde_json::to_value(telemetry)?)
     }
 }
 

src/target/redhat.rs

@@ -13,7 +13,7 @@ use file::{FileTarget, FileOwner};
 use host::Host;
 use package::PackageTarget;
 use package::providers::Providers;
-use serde_json::Value;
+use serde_json;
 use service::ServiceTarget;
 use std::{env, str};
 use std::path::Path;
@@ -166,7 +166,7 @@ impl ServiceTarget for RedhatTarget {
 
 impl TelemetryTarget for RedhatTarget {
     #[allow(unused_variables)]
-    fn telemetry_init(host: &mut Host) -> Result<Value> {
+    fn telemetry_init(host: &mut Host) -> Result<serde_json::Value> {
         let cpu_vendor = try!(linux::cpu_vendor());
         let cpu_brand = try!(linux::cpu_brand_string());
         let hostname = try!(default::hostname());
@@ -193,6 +193,6 @@ impl TelemetryTarget for RedhatTarget {
             ),
         );
 
-        Ok(telemetry.into_value())
+        Ok(serde_json::to_value(telemetry)?)
     }
 }

src/target/ubuntu.rs

@@ -15,7 +15,7 @@ use host::telemetry::{Cpu, Os, Telemetry, TelemetryTarget};
 use package::PackageTarget;
 use package::providers::Providers;
 use regex::Regex;
-use serde_json::Value;
+use serde_json;
 use service::ServiceTarget;
 use std::env;
 use std::path::Path;
@@ -168,7 +168,7 @@ impl ServiceTarget for UbuntuTarget {
 
 impl TelemetryTarget for UbuntuTarget {
     #[allow(unused_variables)]
-    fn telemetry_init(host: &mut Host) -> Result<Value> {
+    fn telemetry_init(host: &mut Host) -> Result<serde_json::Value> {
         let cpu_vendor = try!(linux::cpu_vendor());
         let cpu_brand = try!(linux::cpu_brand_string());
         let hostname = try!(default::hostname());
@@ -187,7 +187,7 @@ impl TelemetryTarget for UbuntuTarget {
             Os::new(env::consts::ARCH, "debian", "ubuntu", &version_str, version_maj, version_min, version_patch),
         );
 
-        Ok(telemetry.into_value())
+        Ok(serde_json::to_value(telemetry)?)
     }
 }