Reimplement tree printing using 'ptree'

This patch reimplements the tree-printing using the 'ptree' crate.
Because ptree wants the tree item to implement `Clone`, a wrapper type is
added which then implements `Clone` and `ptree::TreeItem`

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

1 files changed, 2 insertions, 11 deletions

diff --git a/src/commands/tree_of.rs b/src/commands/tree_of.rs
index 0db3978..d357ce8 100644
--- a/src/commands/tree_of.rs
+++ b/src/commands/tree_of.rs
@@ -8,8 +8,7 @@
 // SPDX-License-Identifier: EPL-2.0
 //
 
-use std::io::Write;
-
+use anyhow::Error;
 use anyhow::Result;
 use clap::ArgMatches;
 use resiter::AndThen;
@@ -24,14 +23,6 @@ pub async fn tree_of(matches: &ArgMatches, repo: Repository, progressbars: Progr
     let pname = matches.value_of("package_name").map(String::from).map(PackageName::from);
     let pvers = matches.value_of("package_version").map(String::from).map(PackageVersionConstraint::new).transpose()?;
 
-    fn print_package_tree(out: &mut dyn Write, indent: usize, tree: Tree) -> Result<()> {
-        for (pkg, tree) in tree.into_iter() {
-            writeln!(out, "{:indent$}{name} {version}", "", indent = indent, name = pkg.name(), version = pkg.version())?;
-            print_package_tree(out, indent + 2, tree)?;
-        }
-        Ok(())
-    }
-
     repo.packages()
         .filter(|p| pname.as_ref().map(|n| p.name() == n).unwrap_or(true))
         .filter(|p| pvers.as_ref().map(|v| v.matches(p.version())).unwrap_or(true))
@@ -46,7 +37,7 @@ pub async fn tree_of(matches: &ArgMatches, repo: Repository, progressbars: Progr
             let stdout = std::io::stdout();
             let mut outlock = stdout.lock();
 
-            print_package_tree(&mut outlock, 0, tree)
+            tree.display().iter().try_for_each(|d| ptree::write_tree(d, &mut outlock).map_err(Error::from))
         })
         .collect::<Result<()>>()
 }