[broken] [WIP] switch to cargo_metadata instead of rewriting it

Author: jyn514

Cargo.lock

@@ -21,6 +21,7 @@ regex = "1"
 structopt = "0.3"
 crates-index = "0.15.1"
 crates-index-diff = "7"
+cargo_metadata = "0.12"
 reqwest = { version = "0.10.6", features = ["blocking", "json"] } # TODO: Remove blocking when async is ready
 semver = { version = "0.9", features = ["serde"] }
 slug = "=0.1.1"

Cargo.toml

@@ -1,11 +1,12 @@
 use crate::error::Result;
+use failure::ResultExt;
 use rustwide::{cmd::Command, Toolchain, Workspace};
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, HashSet};
 use std::path::Path;
 
 pub(crate) struct CargoMetadata {
-    packages: HashMap<String, Package>,
+    packages: HashMap<String, ::cargo_metadata::Package>,
     deps_graph: HashMap<String, HashSet<String>>,
     root_id: String,
 }
@@ -22,33 +23,46 @@ impl CargoMetadata {
             .log_output(false)
             .run_capture()?;
 
+        let metadata = cargo_metadata::MetadataCommand::parse(&res.stdout_lines().join("\n"))
+            .context("invalid output returned by `cargo metadata`")?;
+        /*
         let mut iter = res.stdout_lines().iter();
         let metadata = if let (Some(serialized), None) = (iter.next(), iter.next()) {
             serde_json::from_str::<DeserializedMetadata>(serialized)?
         } else {
             return Err(::failure::err_msg(
-                "invalid output returned by `cargo metadata`",
             ));
         };
+        */
 
+        let resolve = metadata
+            .resolve
+            .ok_or(failure::err_msg("expected resolve metadata"))?;
         // Convert from Vecs to HashMaps and HashSets to get more efficient lookups
         Ok(CargoMetadata {
             packages: metadata
                 .packages
                 .into_iter()
-                .map(|pkg| (pkg.id.clone(), pkg))
+                .map(|pkg| (pkg.id.to_string(), pkg))
                 .collect(),
-            deps_graph: metadata
-                .resolve
+            deps_graph: resolve
                 .nodes
                 .into_iter()
-                .map(|node| (node.id, node.deps.into_iter().map(|d| d.pkg).collect()))
+                .map(|node| {
+                    (
+                        node.id.to_string(),
+                        node.deps.into_iter().map(|d| d.pkg.to_string()).collect(),
+                    )
+                })
                 .collect(),
-            root_id: metadata.resolve.root,
+            root_id: resolve
+                .root
+                .ok_or(failure::err_msg("expected resolve root"))?
+                .to_string(),
         })
     }
 
-    pub(crate) fn root_dependencies(&self) -> Vec<&Package> {
+    pub(crate) fn root_dependencies(&self) -> Vec<&cargo_metadata::Package> {
         let ids = &self.deps_graph[&self.root_id];
         self.packages
             .iter()
@@ -57,7 +71,7 @@ impl CargoMetadata {
             .collect()
     }
 
-    pub(crate) fn root(&self) -> &Package {
+    pub(crate) fn root(&self) -> &cargo_metadata::Package {
         &self.packages[&self.root_id]
     }
 }