Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NOISSUE - Remove private enum PrivateDependencyKind now cargo_metadata #182

Merged
merged 1 commit into from
Jan 30, 2021
Merged

NOISSUE - Remove private enum PrivateDependencyKind now cargo_metadata #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 11 additions & 41 deletions cargo-geiger/src/tree/traversal/dependency_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ pub fn walk_dependency_node(
walk_dependency_parameters.print_config,
);

for (dep_kind, nodes) in dependency_type_nodes.iter_mut() {
for (dependency_kind, nodes) in dependency_type_nodes.iter_mut() {
let mut dep_kind_out = walk_dependency_kind(
cargo_metadata_parameters,
dep_kind.to_dependency_kind(),
*dependency_kind,
nodes,
walk_dependency_parameters,
);
Expand All @@ -59,11 +59,11 @@ fn construct_dependency_type_nodes_hashmap<'a>(
graph: &'a Graph,
package: &PackageId,
print_config: &PrintConfig,
) -> HashMap<PrivateDepKind, Vec<PackageId>> {
let mut dependency_type_nodes: HashMap<PrivateDepKind, Vec<PackageId>> = [
(PrivateDepKind::Build, vec![]),
(PrivateDepKind::Development, vec![]),
(PrivateDepKind::Normal, vec![]),
) -> HashMap<DependencyKind, Vec<PackageId>> {
let mut dependency_type_nodes: HashMap<DependencyKind, Vec<PackageId>> = [
(DependencyKind::Build, vec![]),
(DependencyKind::Development, vec![]),
(DependencyKind::Normal, vec![]),
]
.iter()
.cloned()
Expand All @@ -79,44 +79,14 @@ fn construct_dependency_type_nodes_hashmap<'a>(
};

dependency_type_nodes
.get_mut(&PrivateDepKind::from_dependency_kind(&edge.weight()))
.get_mut(&edge.weight())
.unwrap()
.push(dependency.clone());
}

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::*;
Expand Down Expand Up @@ -206,15 +176,15 @@ mod dependency_node_tests {
);

assert_eq!(
dependency_type_nodes_hashmap[&PrivateDepKind::Build].len(),
dependency_type_nodes_hashmap[&DependencyKind::Build].len(),
expected_build_nodes_length
);
assert_eq!(
dependency_type_nodes_hashmap[&PrivateDepKind::Development].len(),
dependency_type_nodes_hashmap[&DependencyKind::Development].len(),
expected_development_nodes_length
);
assert_eq!(
dependency_type_nodes_hashmap[&PrivateDepKind::Normal].len(),
dependency_type_nodes_hashmap[&DependencyKind::Normal].len(),
expected_normal_nodes_length
);
}
Expand Down