Merge pull request #165 from jmcconnell26/ISSUE-69-CleanupTestOnlyTrait

ISSUE-16 - Cleanup a trait only used in a unit test module
geiger-rs · Dec 17, 2020 · ba85801 · ba85801
2 parents 91594c9 + 19043c6
commit ba85801
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/cargo-geiger/src/args.rs b/cargo-geiger/src/args.rs
@@ -244,7 +244,6 @@ fn parse_features(raw_features: Option<String>) -> Vec<String> {
 pub mod args_tests {
     use super::*;
 
-    use cargo::core::shell::ColorChoice;
     use cargo::core::Verbosity;
     use rstest::*;
     use std::ffi::OsString;

diff --git a/cargo-geiger/src/mapping.rs b/cargo-geiger/src/mapping.rs
@@ -3,7 +3,6 @@ mod krates;
 mod metadata;
 
 use ::krates::Krates;
-use cargo::core::dependency::DepKind;
 use cargo_metadata::Metadata;
 use std::collections::HashSet;
 use std::path::PathBuf;
@@ -69,10 +68,6 @@ pub trait QueryResolve {
     fn query_resolve(&self, query: &str) -> Option<cargo_metadata::PackageId>;
 }
 
-pub trait ToCargoCoreDepKind {
-    fn to_cargo_core_dep_kind(&self) -> DepKind;
-}
-
 pub trait ToCargoGeigerDependencyKind {
     fn to_cargo_geiger_dependency_kind(
         &self,

diff --git a/cargo-geiger/src/mapping/metadata.rs b/cargo-geiger/src/mapping/metadata.rs
@@ -137,20 +137,23 @@ impl ToCargoMetadataPackage for cargo_metadata::PackageId {
 mod metadata_tests {
     use super::*;
 
-    use super::super::{
-        GetPackageNameFromCargoMetadataPackageId, ToCargoCoreDepKind,
-    };
+    use super::super::GetPackageNameFromCargoMetadataPackageId;
 
     use crate::args::FeaturesArgs;
     use crate::cli::get_workspace;
 
+    // ISSUE-69 - These dependencies are used for testing only, to confirm
+    // that the changes made for ISSUE-16 retain feature parity. A discussion can
+    // be had about if it is worth keeping these in and paying the corresponding
+    // cost in compile time when building tests
     use cargo::core::dependency::DepKind;
     use cargo::core::registry::PackageRegistry;
     use cargo::core::resolver::ResolveOpts;
     use cargo::core::{
         Package, PackageId, PackageIdSpec, PackageSet, Resolve, Workspace,
     };
     use cargo::{ops, CargoResult, Config};
+
     use cargo_metadata::{CargoOpt, Metadata, MetadataCommand};
     use krates::Builder as KratesBuilder;
     use rstest::*;
@@ -343,6 +346,10 @@ mod metadata_tests {
         Ok((packages, resolve))
     }
 
+    trait ToCargoCoreDepKind {
+        fn to_cargo_core_dep_kind(&self) -> DepKind;
+    }
+
     impl ToCargoCoreDepKind for DependencyKind {
         fn to_cargo_core_dep_kind(&self) -> DepKind {
             match self {