From 3044f48569ce8c0e07f7495559ce4fb1468787c4 Mon Sep 17 00:00:00 2001 From: joshmc Date: Mon, 23 Nov 2020 19:14:36 +0000 Subject: [PATCH] ISSUE-16 - Remove use of cargo::core: * Replace usage of cargo core dependency kind * Remove use of package set Signed-off-by: joshmc --- cargo-geiger/src/format.rs | 17 +++--- .../src/format/table/handle_text_tree_line.rs | 18 ++++-- cargo-geiger/src/mapping.rs | 6 ++ cargo-geiger/src/mapping/metadata.rs | 19 ++++++- cargo-geiger/src/scan.rs | 20 ++----- cargo-geiger/src/scan/default.rs | 10 +--- cargo-geiger/src/scan/default/table.rs | 11 +--- cargo-geiger/src/scan/find.rs | 18 +----- cargo-geiger/src/scan/forbid.rs | 2 - cargo-geiger/src/scan/forbid/table.rs | 4 -- cargo-geiger/src/tree.rs | 7 ++- cargo-geiger/src/tree/traversal.rs | 3 - .../src/tree/traversal/dependency_kind.rs | 35 +++++------- .../src/tree/traversal/dependency_node.rs | 57 ++++++++++++++----- 14 files changed, 116 insertions(+), 111 deletions(-) diff --git a/cargo-geiger/src/format.rs b/cargo-geiger/src/format.rs index 7920dccc..fd38ed42 100644 --- a/cargo-geiger/src/format.rs +++ b/cargo-geiger/src/format.rs @@ -6,7 +6,7 @@ pub mod table; mod display; mod parse; -use cargo::core::dependency::DepKind; +use cargo_metadata::DependencyKind; use std::fmt; use std::str::{self, FromStr}; use strum_macros::EnumIter; @@ -79,11 +79,12 @@ impl fmt::Display for FormatError { } } -pub fn get_kind_group_name(dep_kind: DepKind) -> Option<&'static str> { +pub fn get_kind_group_name(dep_kind: DependencyKind) -> Option<&'static str> { match dep_kind { - DepKind::Build => Some("[build-dependencies]"), - DepKind::Development => Some("[dev-dependencies]"), - DepKind::Normal => None, + DependencyKind::Build => Some("[build-dependencies]"), + DependencyKind::Development => Some("[dev-dependencies]"), + DependencyKind::Normal => None, + _ => panic!("Unrecognised Dependency Kind"), } } @@ -103,15 +104,15 @@ mod format_tests { #[rstest] fn get_kind_group_name_test() { assert_eq!( - get_kind_group_name(DepKind::Build), + get_kind_group_name(DependencyKind::Build), Some("[build-dependencies]") ); assert_eq!( - get_kind_group_name(DepKind::Development), + get_kind_group_name(DependencyKind::Development), Some("[dev-dependencies]") ); - assert_eq!(get_kind_group_name(DepKind::Normal), None); + assert_eq!(get_kind_group_name(DependencyKind::Normal), None); } } diff --git a/cargo-geiger/src/format/table/handle_text_tree_line.rs b/cargo-geiger/src/format/table/handle_text_tree_line.rs index 64a7854b..74ae0470 100644 --- a/cargo-geiger/src/format/table/handle_text_tree_line.rs +++ b/cargo-geiger/src/format/table/handle_text_tree_line.rs @@ -8,7 +8,7 @@ use super::total_package_counts::TotalPackageCounts; use super::TableParameters; use super::{table_row, table_row_empty}; -use cargo::core::dependency::DepKind; +use cargo_metadata::DependencyKind; use std::collections::HashSet; pub struct HandlePackageParameters<'a> { @@ -18,7 +18,7 @@ pub struct HandlePackageParameters<'a> { } pub fn handle_text_tree_line_extra_deps_group( - dep_kind: DepKind, + dep_kind: DependencyKind, table_lines: &mut Vec, tree_vines: String, ) { @@ -162,12 +162,18 @@ mod handle_text_tree_line_tests { #[rstest( input_dep_kind, expected_kind_group_name, - case(DepKind::Build, Some(String::from("[build-dependencies]"))), - case(DepKind::Development, Some(String::from("[dev-dependencies]"))), - case(DepKind::Normal, None) + case( + DependencyKind::Build, + Some(String::from("[build-dependencies]")) + ), + case( + DependencyKind::Development, + Some(String::from("[dev-dependencies]")) + ), + case(DependencyKind::Normal, None) )] fn handle_text_tree_line_extra_deps_group_test( - input_dep_kind: DepKind, + input_dep_kind: DependencyKind, expected_kind_group_name: Option, ) { let mut table_lines = Vec::::new(); diff --git a/cargo-geiger/src/mapping.rs b/cargo-geiger/src/mapping.rs index 3b4163a8..b0b1216c 100644 --- a/cargo-geiger/src/mapping.rs +++ b/cargo-geiger/src/mapping.rs @@ -72,6 +72,12 @@ pub trait ToCargoCoreDepKind { fn to_cargo_core_dep_kind(&self) -> DepKind; } +pub trait ToCargoGeigerDependencyKind { + fn to_cargo_geiger_dependency_kind( + &self, + ) -> cargo_geiger_serde::DependencyKind; +} + pub trait ToCargoGeigerPackageId { fn to_cargo_geiger_package_id( &self, diff --git a/cargo-geiger/src/mapping/metadata.rs b/cargo-geiger/src/mapping/metadata.rs index 3f3f566a..9517fac9 100644 --- a/cargo-geiger/src/mapping/metadata.rs +++ b/cargo-geiger/src/mapping/metadata.rs @@ -5,7 +5,7 @@ use super::{ ToCargoMetadataPackageId, ToPackage, ToPackageId, }; -use crate::mapping::ToCargoMetadataPackage; +use crate::mapping::{ToCargoGeigerDependencyKind, ToCargoMetadataPackage}; use cargo::core::dependency::DepKind; use cargo::core::{Package, PackageId, PackageSet}; @@ -79,6 +79,23 @@ impl ToCargoCoreDepKind for DependencyKind { } } +impl ToCargoGeigerDependencyKind for cargo_metadata::DependencyKind { + fn to_cargo_geiger_dependency_kind( + &self, + ) -> cargo_geiger_serde::DependencyKind { + match self { + DependencyKind::Build => cargo_geiger_serde::DependencyKind::Build, + DependencyKind::Development => { + cargo_geiger_serde::DependencyKind::Development + } + DependencyKind::Normal => { + cargo_geiger_serde::DependencyKind::Normal + } + _ => panic!("Unrecognised Dependency Kind"), + } + } +} + impl ToCargoGeigerPackageId for cargo_metadata::PackageId { fn to_cargo_geiger_package_id( &self, diff --git a/cargo-geiger/src/scan.rs b/cargo-geiger/src/scan.rs index 3d20f739..845df74c 100644 --- a/cargo-geiger/src/scan.rs +++ b/cargo-geiger/src/scan.rs @@ -7,7 +7,8 @@ use crate::args::Args; use crate::format::print_config::PrintConfig; use crate::graph::Graph; use crate::mapping::{ - CargoMetadataParameters, ToCargoCoreDepKind, ToCargoGeigerPackageId, + CargoMetadataParameters, ToCargoGeigerDependencyKind, + ToCargoGeigerPackageId, }; pub use rs_file::RsFileMetricsWrapper; @@ -15,12 +16,9 @@ pub use rs_file::RsFileMetricsWrapper; use default::scan_unsafe; use forbid::scan_forbid_unsafe; -use cargo::core::dependency::DepKind; use cargo::core::{PackageSet, Workspace}; use cargo::{CliResult, Config}; -use cargo_geiger_serde::{ - CounterBlock, DependencyKind, PackageInfo, UnsafeInfo, -}; +use cargo_geiger_serde::{CounterBlock, PackageInfo, UnsafeInfo}; use petgraph::visit::EdgeRef; use std::collections::{HashMap, HashSet}; use std::path::PathBuf; @@ -197,9 +195,7 @@ fn package_metrics( package.add_dependency( dep, - from_cargo_dependency_kind( - edge.weight().to_cargo_core_dep_kind(), - ), + edge.weight().to_cargo_geiger_dependency_kind(), ); } match geiger_context.package_id_to_metrics.get(&package_id) { @@ -217,14 +213,6 @@ fn package_metrics( package_metrics } -fn from_cargo_dependency_kind(kind: DepKind) -> DependencyKind { - match kind { - DepKind::Normal => DependencyKind::Normal, - DepKind::Development => DependencyKind::Development, - DepKind::Build => DependencyKind::Build, - } -} - #[cfg(test)] mod scan_tests { use super::*; diff --git a/cargo-geiger/src/scan/default.rs b/cargo-geiger/src/scan/default.rs index 4351cef0..28694b20 100644 --- a/cargo-geiger/src/scan/default.rs +++ b/cargo-geiger/src/scan/default.rs @@ -41,7 +41,6 @@ pub fn scan_unsafe( None => scan_to_table( cargo_metadata_parameters, graph, - package_set, root_package_id, scan_parameters, workspace, @@ -89,7 +88,6 @@ fn build_compile_options<'a>( fn scan( cargo_metadata_parameters: &CargoMetadataParameters, - package_set: &PackageSet, scan_parameters: &ScanParameters, workspace: &Workspace, ) -> Result { @@ -103,7 +101,6 @@ fn scan( cargo_metadata_parameters, scan_parameters.config, ScanMode::Full, - package_set, scan_parameters.print_config, )?; Ok(ScanDetails { @@ -124,12 +121,7 @@ fn scan_to_report( let ScanDetails { rs_files_used, geiger_context, - } = scan( - cargo_metadata_parameters, - package_set, - scan_parameters, - workspace, - )?; + } = scan(cargo_metadata_parameters, scan_parameters, workspace)?; let mut report = SafetyReport::default(); for (package, package_metrics_option) in package_metrics( cargo_metadata_parameters, diff --git a/cargo-geiger/src/scan/default/table.rs b/cargo-geiger/src/scan/default/table.rs index 32893a93..7c73860e 100644 --- a/cargo-geiger/src/scan/default/table.rs +++ b/cargo-geiger/src/scan/default/table.rs @@ -14,7 +14,7 @@ use super::scan; use crate::mapping::CargoMetadataParameters; use cargo::core::shell::Verbosity; -use cargo::core::{PackageSet, Workspace}; +use cargo::core::Workspace; use cargo::{CliError, CliResult}; use colored::Colorize; use std::error::Error; @@ -23,7 +23,6 @@ use std::fmt; pub fn scan_to_table( cargo_metadata_parameters: &CargoMetadataParameters, graph: &Graph, - package_set: &PackageSet, root_package_id: cargo_metadata::PackageId, scan_parameters: &ScanParameters, workspace: &Workspace, @@ -33,12 +32,7 @@ pub fn scan_to_table( let ScanDetails { rs_files_used, geiger_context, - } = scan( - cargo_metadata_parameters, - package_set, - scan_parameters, - workspace, - )?; + } = scan(cargo_metadata_parameters, scan_parameters, workspace)?; if scan_parameters.print_config.verbosity == Verbosity::Verbose { let mut rs_files_used_lines = @@ -53,7 +47,6 @@ pub fn scan_to_table( let text_tree_lines = walk_dependency_tree( cargo_metadata_parameters, &graph, - package_set, &scan_parameters.print_config, root_package_id, ); diff --git a/cargo-geiger/src/scan/find.rs b/cargo-geiger/src/scan/find.rs index 9256d756..8e218f2f 100644 --- a/cargo-geiger/src/scan/find.rs +++ b/cargo-geiger/src/scan/find.rs @@ -1,7 +1,5 @@ use crate::format::print_config::PrintConfig; -use crate::mapping::{ - CargoMetadataParameters, GetRoot, ToCargoMetadataPackage, -}; +use crate::mapping::{CargoMetadataParameters, GetRoot}; use crate::scan::rs_file::{ into_is_entry_point_and_path_buf, into_rs_code_file, into_target_kind, is_file_with_ext, RsFile, RsFileMetricsWrapper, @@ -10,7 +8,6 @@ use crate::scan::PackageMetrics; use super::{GeigerContext, ScanMode}; -use cargo::core::package::PackageSet; use cargo::util::CargoResult; use cargo::{CliError, Config}; use geiger::{find_unsafe_in_file, IncludeTests, RsFileMetrics, ScanFileError}; @@ -23,7 +20,6 @@ pub fn find_unsafe( cargo_metadata_parameters: &CargoMetadataParameters, config: &Config, mode: ScanMode, - package_set: &PackageSet, print_config: &PrintConfig, ) -> Result { let mut progress = cargo::util::Progress::new("Scanning", config); @@ -32,7 +28,6 @@ pub fn find_unsafe( cargo_metadata_parameters, print_config.include_tests, mode, - package_set, |i, count| -> CargoResult<()> { progress.tick(i, count) }, ); progress.clear(); @@ -45,22 +40,13 @@ fn find_unsafe_in_packages( cargo_metadata_parameters: &CargoMetadataParameters, include_tests: IncludeTests, mode: ScanMode, - package_set: &PackageSet, mut progress_step: F, ) -> GeigerContext where F: FnMut(usize, usize) -> CargoResult<()>, { let mut package_id_to_metrics = HashMap::new(); - let packages = package_set - .get_many(package_set.package_ids()) - .unwrap() - .iter() - .map(|p| { - p.to_cargo_metadata_package(cargo_metadata_parameters.metadata) - .unwrap() - }) - .collect::>(); + let packages = cargo_metadata_parameters.metadata.packages.to_vec(); let package_code_files: Vec<_> = find_rs_files_in_packages(&packages).collect(); let package_code_file_count = package_code_files.len(); diff --git a/cargo-geiger/src/scan/forbid.rs b/cargo-geiger/src/scan/forbid.rs index e4ad22ee..6337c800 100644 --- a/cargo-geiger/src/scan/forbid.rs +++ b/cargo-geiger/src/scan/forbid.rs @@ -34,7 +34,6 @@ pub fn scan_forbid_unsafe( cargo_metadata_parameters, scan_parameters.config, graph, - package_set, scan_parameters.print_config, root_package_id, ), @@ -54,7 +53,6 @@ fn scan_forbid_to_report( cargo_metadata_parameters, config, ScanMode::EntryPointsOnly, - package_set, print_config, )?; let mut report = QuickSafetyReport::default(); diff --git a/cargo-geiger/src/scan/forbid/table.rs b/cargo-geiger/src/scan/forbid/table.rs index 3366f46d..5ad98045 100644 --- a/cargo-geiger/src/scan/forbid/table.rs +++ b/cargo-geiger/src/scan/forbid/table.rs @@ -11,7 +11,6 @@ use super::super::find::find_unsafe; use super::super::ScanMode; use crate::scan::GeigerContext; -use cargo::core::PackageSet; use cargo::{CliResult, Config}; use colored::Colorize; @@ -19,7 +18,6 @@ pub fn scan_forbid_to_table( cargo_metadata_parameters: &CargoMetadataParameters, config: &Config, graph: &Graph, - package_set: &PackageSet, print_config: &PrintConfig, root_package_id: cargo_metadata::PackageId, ) -> CliResult { @@ -32,7 +30,6 @@ pub fn scan_forbid_to_table( let tree_lines = walk_dependency_tree( cargo_metadata_parameters, &graph, - package_set, &print_config, root_package_id, ); @@ -56,7 +53,6 @@ pub fn scan_forbid_to_table( cargo_metadata_parameters, config, ScanMode::EntryPointsOnly, - package_set, print_config, )?; diff --git a/cargo-geiger/src/tree.rs b/cargo-geiger/src/tree.rs index e5ddac36..9cb14c2c 100644 --- a/cargo-geiger/src/tree.rs +++ b/cargo-geiger/src/tree.rs @@ -3,7 +3,7 @@ pub mod traversal; use crate::format::print_config::{Prefix, PrintConfig}; use crate::format::Charset; -use cargo::core::dependency::DepKind; +use cargo_metadata::DependencyKind; /// A step towards decoupling some parts of the table-tree printing from the /// dependency graph traversal. @@ -16,7 +16,10 @@ pub enum TextTreeLine { }, /// There are extra dependencies coming and we should print a group header, /// eg. "[build-dependencies]". - ExtraDepsGroup { kind: DepKind, tree_vines: String }, + ExtraDepsGroup { + kind: DependencyKind, + tree_vines: String, + }, } #[derive(Debug, PartialEq)] diff --git a/cargo-geiger/src/tree/traversal.rs b/cargo-geiger/src/tree/traversal.rs index b9b7021c..0565fe51 100644 --- a/cargo-geiger/src/tree/traversal.rs +++ b/cargo-geiger/src/tree/traversal.rs @@ -10,7 +10,6 @@ use super::construct_tree_vines_string; use dependency_kind::walk_dependency_kind; use dependency_node::walk_dependency_node; -use cargo::core::PackageSet; use std::collections::HashSet; pub struct WalkDependencyParameters<'a> { @@ -29,7 +28,6 @@ pub struct WalkDependencyParameters<'a> { pub fn walk_dependency_tree( cargo_metadata_parameters: &CargoMetadataParameters, graph: &Graph, - package_set: &PackageSet, print_config: &PrintConfig, root_package_id: cargo_metadata::PackageId, ) -> Vec { @@ -47,7 +45,6 @@ pub fn walk_dependency_tree( walk_dependency_node( cargo_metadata_parameters, &node, - package_set, &mut walk_dependency_paramters, ) } diff --git a/cargo-geiger/src/tree/traversal/dependency_kind.rs b/cargo-geiger/src/tree/traversal/dependency_kind.rs index 1916b51c..7991a6bd 100644 --- a/cargo-geiger/src/tree/traversal/dependency_kind.rs +++ b/cargo-geiger/src/tree/traversal/dependency_kind.rs @@ -1,20 +1,18 @@ use crate::format::print_config::Prefix; +use crate::mapping::CargoMetadataParameters; use crate::tree::traversal::WalkDependencyParameters; use crate::tree::{get_tree_symbols, TextTreeLine, TreeSymbols}; use super::dependency_node::walk_dependency_node; -use crate::mapping::CargoMetadataParameters; -use cargo::core::dependency::DepKind; -use cargo::core::PackageSet; +use cargo_metadata::DependencyKind; use std::iter::Peekable; use std::slice::Iter; pub fn walk_dependency_kind( cargo_metadata_parameters: &CargoMetadataParameters, - dep_kind: DepKind, + dep_kind: DependencyKind, deps: &mut Vec, - package_set: &PackageSet, walk_dependency_parameters: &mut WalkDependencyParameters, ) -> Vec { if deps.is_empty() { @@ -42,7 +40,6 @@ pub fn walk_dependency_kind( cargo_metadata_parameters, dependency, &mut node_iterator, - package_set, &mut text_tree_lines, walk_dependency_parameters, ); @@ -54,7 +51,6 @@ fn handle_walk_dependency_node( cargo_metadata_parameters: &CargoMetadataParameters, dependency: &cargo_metadata::PackageId, node_iterator: &mut Peekable>, - package_set: &PackageSet, text_tree_lines: &mut Vec, walk_dependency_parameters: &mut WalkDependencyParameters, ) { @@ -64,20 +60,19 @@ fn handle_walk_dependency_node( text_tree_lines.append(&mut walk_dependency_node( cargo_metadata_parameters, dependency, - package_set, walk_dependency_parameters, )); walk_dependency_parameters.levels_continue.pop(); } fn push_extra_deps_group_text_tree_line_for_non_normal_dependencies( - dep_kind: DepKind, + dep_kind: DependencyKind, levels_continue: &[bool], tree_symbols: &TreeSymbols, text_tree_lines: &mut Vec, ) { match dep_kind { - DepKind::Normal => (), + DependencyKind::Normal => (), _ => { let mut tree_vines = String::new(); for &continues in &*levels_continue { @@ -106,21 +101,21 @@ mod traversal_tests { input_levels_continue, expected_text_tree_lines, case( - DepKind::Build, + DependencyKind::Build, vec![], vec![ ExtraDepsGroup { - kind: DepKind::Build, + kind: DependencyKind::Build, tree_vines: String::from("") } ] ), case( - DepKind::Build, + DependencyKind::Build, vec![false, true], vec![ ExtraDepsGroup { - kind: DepKind::Build, + kind: DependencyKind::Build, tree_vines: format!( " {} ", get_tree_symbols(Charset::Utf8).down @@ -129,11 +124,11 @@ mod traversal_tests { ] ), case( - DepKind::Development, + DependencyKind::Development, vec![true], vec![ ExtraDepsGroup { - kind: DepKind::Development, + kind: DependencyKind::Development, tree_vines: format!( "{} ", get_tree_symbols(Charset::Utf8).down @@ -142,23 +137,23 @@ mod traversal_tests { ] ), case( - DepKind::Development, + DependencyKind::Development, vec![false], vec![ ExtraDepsGroup { - kind: DepKind::Development, + kind: DependencyKind::Development, tree_vines: String::from(" ") } ] ), case( - DepKind::Normal, + DependencyKind::Normal, vec![], vec![] ) )] fn push_extra_deps_group_text_tree_line_for_non_normal_dependencies_test( - input_dep_kind: DepKind, + input_dep_kind: DependencyKind, input_levels_continue: Vec, expected_text_tree_lines: Vec, ) { diff --git a/cargo-geiger/src/tree/traversal/dependency_node.rs b/cargo-geiger/src/tree/traversal/dependency_node.rs index 926ac7b9..4551de71 100644 --- a/cargo-geiger/src/tree/traversal/dependency_node.rs +++ b/cargo-geiger/src/tree/traversal/dependency_node.rs @@ -1,14 +1,13 @@ use crate::format::print_config::PrintConfig; use crate::graph::Graph; -use crate::mapping::{CargoMetadataParameters, ToCargoCoreDepKind}; +use crate::mapping::CargoMetadataParameters; use crate::tree::traversal::WalkDependencyParameters; use crate::tree::TextTreeLine; use super::construct_tree_vines_string; use super::walk_dependency_kind; -use cargo::core::dependency::DepKind; -use cargo::core::PackageSet; +use cargo_metadata::DependencyKind; use petgraph::visit::EdgeRef; use petgraph::EdgeDirection; use std::collections::HashMap; @@ -16,7 +15,6 @@ use std::collections::HashMap; pub fn walk_dependency_node( cargo_metadata_parameters: &CargoMetadataParameters, package: &cargo_metadata::PackageId, - package_set: &PackageSet, walk_dependency_parameters: &mut WalkDependencyParameters, ) -> Vec { let new = walk_dependency_parameters.print_config.all @@ -46,9 +44,8 @@ pub fn walk_dependency_node( for (dep_kind, nodes) in dependency_type_nodes.iter_mut() { let mut dep_kind_out = walk_dependency_kind( cargo_metadata_parameters, - *dep_kind, + dep_kind.to_dependency_kind(), nodes, - package_set, walk_dependency_parameters, ); @@ -62,14 +59,14 @@ fn construct_dependency_type_nodes_hashmap<'a>( graph: &'a Graph, package: &cargo_metadata::PackageId, print_config: &PrintConfig, -) -> HashMap> { +) -> HashMap> { let mut dependency_type_nodes: HashMap< - DepKind, + PrivateDepKind, Vec, > = [ - (DepKind::Build, vec![]), - (DepKind::Development, vec![]), - (DepKind::Normal, vec![]), + (PrivateDepKind::Build, vec![]), + (PrivateDepKind::Development, vec![]), + (PrivateDepKind::Normal, vec![]), ] .iter() .cloned() @@ -85,7 +82,7 @@ fn construct_dependency_type_nodes_hashmap<'a>( }; dependency_type_nodes - .get_mut(&edge.weight().to_cargo_core_dep_kind()) + .get_mut(&PrivateDepKind::from_dependency_kind(&edge.weight())) .unwrap() .push(dependency.clone()); } @@ -93,6 +90,36 @@ fn construct_dependency_type_nodes_hashmap<'a>( dependency_type_nodes } +// cargo_metadata::DependencyKind doesn't implement Eq or Hash, and so can't +// be used in a HashMap +#[derive(Clone, Eq, Hash, PartialEq)] +enum PrivateDepKind { + Build, + Development, + Normal, +} + +impl PrivateDepKind { + fn from_dependency_kind( + dependency_kind: &DependencyKind, + ) -> PrivateDepKind { + match dependency_kind { + DependencyKind::Build => PrivateDepKind::Build, + DependencyKind::Development => PrivateDepKind::Development, + DependencyKind::Normal => PrivateDepKind::Normal, + _ => panic!("Unrecognised DependencyKind"), + } + } + + fn to_dependency_kind(&self) -> DependencyKind { + match self { + PrivateDepKind::Build => DependencyKind::Build, + PrivateDepKind::Development => DependencyKind::Development, + PrivateDepKind::Normal => DependencyKind::Normal, + } + } +} + #[cfg(test)] mod dependency_node_tests { use super::*; @@ -185,15 +212,15 @@ mod dependency_node_tests { ); assert_eq!( - dependency_type_nodes_hashmap[&DepKind::Build].len(), + dependency_type_nodes_hashmap[&PrivateDepKind::Build].len(), expected_build_nodes_length ); assert_eq!( - dependency_type_nodes_hashmap[&DepKind::Development].len(), + dependency_type_nodes_hashmap[&PrivateDepKind::Development].len(), expected_development_nodes_length ); assert_eq!( - dependency_type_nodes_hashmap[&DepKind::Normal].len(), + dependency_type_nodes_hashmap[&PrivateDepKind::Normal].len(), expected_normal_nodes_length ); }