Add kind/platform info to cargo metadata

Author: ehuss

src/cargo/ops/cargo_output_metadata.rs

@@ -1,9 +1,9 @@
 use crate::core::compiler::{CompileKind, CompileTarget, TargetInfo};
 use crate::core::resolver::{Resolve, ResolveOpts};
-use crate::core::{Package, PackageId, Workspace};
+use crate::core::{dependency, Dependency, Package, PackageId, Workspace};
 use crate::ops::{self, Packages};
 use crate::util::CargoResult;
-
+use cargo_platform::Platform;
 use serde::Serialize;
 use std::collections::HashMap;
 use std::path::PathBuf;
@@ -85,6 +85,22 @@ struct MetadataResolveNode {
 struct Dep {
     name: String,
     pkg: PackageId,
+    dep_kinds: Vec<DepKindInfo>,
+}
+
+#[derive(Serialize)]
+struct DepKindInfo {
+    kind: dependency::Kind,
+    target: Option<Platform>,
+}
+
+impl From<&Dependency> for DepKindInfo {
+    fn from(dep: &Dependency) -> DepKindInfo {
+        DepKindInfo {
+            kind: dep.kind(),
+            target: dep.platform().cloned(),
+        }
+    }
 }
 
 /// Builds the resolve graph as it will be displayed to the user.
@@ -167,12 +183,16 @@ fn build_resolve_graph_r(
             }),
             None => true,
         })
-        .filter_map(|(dep_id, _deps)| {
+        .filter_map(|(dep_id, deps)| {
             package_map
                 .get(&dep_id)
                 .and_then(|pkg| pkg.targets().iter().find(|t| t.is_lib()))
                 .and_then(|lib_target| resolve.extern_crate_name(pkg_id, dep_id, lib_target).ok())
-                .map(|name| Dep { name, pkg: dep_id })
+                .map(|name| Dep {
+                    name,
+                    pkg: dep_id,
+                    dep_kinds: deps.iter().map(DepKindInfo::from).collect(),
+                })
         })
         .collect();
     let dumb_deps: Vec<PackageId> = deps.iter().map(|dep| dep.pkg).collect();

src/doc/man/cargo-metadata.adoc

@@ -201,6 +201,10 @@ The output has the following format:
     ],
     /* The resolved dependency graph, with the concrete versions and features
        selected. The set depends on the enabled features.
+
+       All platform-specific dependencies are listed regardless of the current
+       target.
+
        This is null if --no-deps is specified.
        By default, this includes all dependencies for all target platforms.
        The `--filter-platform` flag may be used to narrow to a specific
@@ -230,7 +234,20 @@ The output has the following format:
                         */
                         "name": "bitflags",
                         /* The Package ID of the dependency. */
-                        "pkg": "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)"
+                        "pkg": "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+                        /* Array of dependency kinds. Added in Cargo 1.38. */
+                        "dep_kinds": [
+                            {
+                                /* The dependency kind.
+                                   "dev", "build", or null for a normal dependency.
+                                */
+                                "kind": null,
+                                /* The target platform for the dependency.
+                                   null if not a target dependency.
+                                */
+                                "target": "cfg(windows)"
+                            }
+                        ]
                     }
                 ],
                 /* Array of features enabled on this package. */

src/doc/man/generated/cargo-metadata.html

@@ -208,6 +208,10 @@ <h2 id="cargo_metadata_output_format">OUTPUT FORMAT</h2>
     ],
     /* The resolved dependency graph, with the concrete versions and features
        selected. The set depends on the enabled features.
+
+       All platform-specific dependencies are listed regardless of the current
+       target.
+
        This is null if --no-deps is specified.
        By default, this includes all dependencies for all target platforms.
        The `--filter-platform` flag may be used to narrow to a specific
@@ -237,7 +241,20 @@ <h2 id="cargo_metadata_output_format">OUTPUT FORMAT</h2>
                         */
                         "name": "bitflags",
                         /* The Package ID of the dependency. */
-                        "pkg": "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)"
+                        "pkg": "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+                        /* Array of dependency kinds. Added in Cargo 1.38. */
+                        "dep_kinds": [
+                            {
+                                /* The dependency kind.
+                                   "dev", "build", or null for a normal dependency.
+                                */
+                                "kind": null,
+                                /* The target platform for the dependency.
+                                   null if not a target dependency.
+                                */
+                                "target": "cfg(windows)"
+                            }
+                        ]
                     }
                 ],
                 /* Array of features enabled on this package. */

src/etc/man/cargo-metadata.1

@@ -222,6 +222,10 @@ The output has the following format:
     ],
     /* The resolved dependency graph, with the concrete versions and features
        selected. The set depends on the enabled features.
+
+       All platform\-specific dependencies are listed regardless of the current
+       target.
+
        This is null if \-\-no\-deps is specified.
        By default, this includes all dependencies for all target platforms.
        The `\-\-filter\-platform` flag may be used to narrow to a specific
@@ -251,7 +255,20 @@ The output has the following format:
                         */
                         "name": "bitflags",
                         /* The Package ID of the dependency. */
-                        "pkg": "bitflags 1.0.4 (registry+https://github.com/rust\-lang/crates.io\-index)"
+                        "pkg": "bitflags 1.0.4 (registry+https://github.com/rust\-lang/crates.io\-index)",
+                        /* Array of dependency kinds. Added in Cargo 1.38. */
+                        "dep_kinds": [
+                            {
+                                /* The dependency kind.
+                                   "dev", "build", or null for a normal dependency.
+                                */
+                                "kind": null,
+                                /* The target platform for the dependency.
+                                   null if not a target dependency.
+                                */
+                                "target": "cfg(windows)"
+                            }
+                        ]
                     }
                 ],
                 /* Array of features enabled on this package. */