WIP

src/commands/tree_of.rs

@@ -103,21 +103,23 @@ fn build_dependencies_tree(
             .map(|res| res.map(|(_, name, vers, deptype)| (name, vers, deptype)))
     }
 
+    let mut d: Vec<(DependenciesNode, DependencyType)> = Vec::new();
     let deps = get_package_dependencies(&p, conditional_data);
-    let mut d = Vec::new();
     for dep in deps {
         let dep = match dep {
             Ok(d) => {
                 trace!("Found dependency {} {}", d.0, d.1);
                 d
             }
             Err(e) => {
-                error!("Package dep not ok {}", e);
+                error!("Dependency not ok {}", e);
                 continue;
             }
         };
+
         let package_name = dep.0;
         let package_version_constraint = dep.1;
+        let package_dependency_type = dep.2;
 
         trace!(
             "Searching for ({}, {}) in repo",
@@ -144,7 +146,7 @@ fn build_dependencies_tree(
             }
             _ => {
                 trace!(
-                    "Found multiple packages in repo for ({}, {})",
+                    "Found multiple packages in repo for ({}, {}), taking first one",
                     package_name,
                     package_version_constraint
                 );
@@ -155,19 +157,15 @@ fn build_dependencies_tree(
         let subtree = build_dependencies_tree(pkg.clone(), repo, conditional_data);
         let subtree = match subtree {
             Ok(s) => {
-                trace!(
-                    "Subtree ok, for ({}, {})",
-                    package_name,
-                    package_version_constraint
-                );
+                trace!("Subtree ok, {:?}", pkg);
                 s
             }
             Err(e) => {
                 error!("Failed to build subtree, {}", e);
                 continue;
             }
         };
-        d.push((subtree, dep.2));
+        d.push((subtree, package_dependency_type));
     }
 
     trace!("d.len: {:?}", d.len());