Add version requirement format option to cargo tree

Also update unit tests with test cases for normal and inverted
output.

Signed-off-by: Alexandre Barone <[email protected]>

Author: devodev

src/cargo/ops/tree/format/mod.rs

@@ -14,6 +14,7 @@ enum Chunk {
     Repository,
     Features,
     LibName,
+    VersionRequirement,
 }
 
 pub struct Pattern(Vec<Chunk>);
@@ -30,6 +31,7 @@ impl Pattern {
                 RawChunk::Argument("r") => Chunk::Repository,
                 RawChunk::Argument("f") => Chunk::Features,
                 RawChunk::Argument("lib") => Chunk::LibName,
+                RawChunk::Argument("ver-req") => Chunk::VersionRequirement,
                 RawChunk::Argument(a) => {
                     bail!("unsupported pattern `{}`", a);
                 }
@@ -111,6 +113,13 @@ impl<'a> fmt::Display for Display<'a> {
                                 write!(fmt, "{}", target.crate_name())?;
                             }
                         }
+                        Chunk::VersionRequirement => {
+                            if let Some(version_req) =
+                                self.graph.version_req_for_id(package.package_id())
+                            {
+                                write!(fmt, "{}", version_req)?;
+                            }
+                        }
                     }
                 }
             }

src/cargo/ops/tree/graph.rs

@@ -6,8 +6,8 @@ use crate::core::dependency::DepKind;
 use crate::core::resolver::Resolve;
 use crate::core::resolver::features::{CliFeatures, FeaturesFor, ResolvedFeatures};
 use crate::core::{FeatureMap, FeatureValue, Package, PackageId, PackageIdSpec, Workspace};
-use crate::util::CargoResult;
 use crate::util::interning::{INTERNED_DEFAULT, InternedString};
+use crate::util::{CargoResult, OptVersionReq};
 use std::collections::{HashMap, HashSet};
 
 #[derive(Debug, Copy, Clone)]
@@ -161,6 +161,8 @@ pub struct Graph<'a> {
     /// Key is the index of a package node, value is a map of `dep_name` to a
     /// set of `(pkg_node_index, is_optional)`.
     dep_name_map: HashMap<NodeId, HashMap<InternedString, HashSet<(NodeId, bool)>>>,
+    /// Map for looking up version requirements for dependency packages.
+    version_req_map: HashMap<PackageId, OptVersionReq>,
 }
 
 impl<'a> Graph<'a> {
@@ -172,6 +174,7 @@ impl<'a> Graph<'a> {
             package_map,
             cli_features: HashSet::new(),
             dep_name_map: HashMap::new(),
+            version_req_map: HashMap::new(),
         }
     }
 
@@ -240,6 +243,12 @@ impl<'a> Graph<'a> {
         }
     }
 
+    /// Returns the version requirement for the given package ID. Returns `None`
+    /// if no version requirement is recorded (e.g., root packages).
+    pub fn version_req_for_id(&self, package_id: PackageId) -> Option<&OptVersionReq> {
+        self.version_req_map.get(&package_id)
+    }
+
     /// Returns `true` if the given feature node index is a feature enabled
     /// via the command-line.
     pub fn is_cli_feature(&self, index: NodeId) -> bool {
@@ -523,6 +532,12 @@ fn add_pkg(
                 requested_kind,
                 opts,
             );
+            // Store the version requirement for this dependency for
+            // later use in formatting.
+            graph.version_req_map.insert(
+                graph.package_id_for_index(dep_index),
+                dep.version_req().clone(),
+            );
             let new_edge = Edge {
                 kind: EdgeKind::Dep(dep.kind()),
                 node: dep_index,

tests/testsuite/cargo_tree/deps.rs

@@ -1248,25 +1248,25 @@ foo v0.1.0 ([ROOT]/foo) [bar,default,dep_that_is_awesome,foo,other-dep]
         .run();
 
     p.cargo("tree --all-features")
-        .arg("--format={p}")
+        .arg("--format={p} satisfies {ver-req}")
         .with_stdout_data(str![[r#"
-foo v0.1.0 ([ROOT]/foo)
-├── dep v1.0.0
-├── dep_that_is_awesome v1.0.0
-└── other-dep v1.0.0
-    └── dep v1.0.0
+foo v0.1.0 ([ROOT]/foo) satisfies 
+├── dep v1.0.0 satisfies ^1.0
+├── dep_that_is_awesome v1.0.0 satisfies >=1.0, <2
+└── other-dep v1.0.0 satisfies ^1.0
+    └── dep v1.0.0 satisfies ^1.0
 
 "#]])
         .run();
 
     p.cargo("tree --all-features")
-        .arg("--format={p}")
+        .arg("--format={p} satisfies {ver-req}")
         .arg("--invert=dep")
         .with_stdout_data(str![[r#"
-dep v1.0.0
-├── foo v0.1.0 ([ROOT]/foo)
-└── other-dep v1.0.0
-    └── foo v0.1.0 ([ROOT]/foo)
+dep v1.0.0 satisfies ^1.0
+├── foo v0.1.0 ([ROOT]/foo) satisfies 
+└── other-dep v1.0.0 satisfies ^1.0
+    └── foo v0.1.0 ([ROOT]/foo) satisfies 
 
 "#]])
         .run();