Introduce CompileFilter::from_raw_arguments

... in order to give CompileFilter::new as a better API.

Author: dwijnand

src/bin/cargo/commands/run.rs

@@ -49,7 +49,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
             .filter_map(|pkg| pkg.manifest().default_run())
             .collect();
         if default_runs.len() == 1 {
-            compile_opts.filter = CompileFilter::new(
+            compile_opts.filter = CompileFilter::from_raw_arguments(
                 false,
                 vec![default_runs[0].to_owned()],
                 false,

src/bin/cargo/commands/test.rs

@@ -1,4 +1,4 @@
-use cargo::ops::{self, CompileFilter};
+use cargo::ops::{self, CompileFilter, FilterRule};
 
 use crate::command_prelude::*;
 
@@ -112,15 +112,10 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
         compile_opts.build_config.mode = CompileMode::Doctest;
         compile_opts.filter = ops::CompileFilter::new(
             true,
-            Vec::new(),
-            false,
-            Vec::new(),
-            false,
-            Vec::new(),
-            false,
-            Vec::new(),
-            false,
-            false,
+            FilterRule::none(),
+            FilterRule::none(),
+            FilterRule::none(),
+            FilterRule::none(),
         );
     }
 

src/cargo/ops/cargo_compile.rs

@@ -349,6 +349,10 @@ impl FilterRule {
         }
     }
 
+    pub fn none() -> FilterRule {
+        FilterRule::Just(Vec::new())
+    }
+
     fn matches(&self, target: &Target) -> bool {
         match *self {
             FilterRule::All => true,
@@ -372,7 +376,8 @@ impl FilterRule {
 }
 
 impl CompileFilter {
-    pub fn new(
+    /// Construct a CompileFilter from raw command line arguments.
+    pub fn from_raw_arguments(
         lib_only: bool,
         bins: Vec<String>,
         all_bins: bool,
@@ -398,7 +403,20 @@ impl CompileFilter {
                 benches: FilterRule::All,
                 tests: FilterRule::All,
             }
-        } else if lib_only
+        } else {
+            CompileFilter::new(lib_only, rule_bins, rule_tsts, rule_exms, rule_bens)
+        }
+    }
+
+    /// Construct a CompileFilter from underlying primitives.
+    pub fn new(
+        lib_only: bool,
+        rule_bins: FilterRule,
+        rule_tsts: FilterRule,
+        rule_exms: FilterRule,
+        rule_bens: FilterRule,
+    ) -> CompileFilter {
+        if lib_only
             || rule_bins.is_specific()
             || rule_tsts.is_specific()
             || rule_exms.is_specific()

src/cargo/util/command_prelude.rs

@@ -328,7 +328,7 @@ pub trait ArgMatchesExt {
             all_features: self._is_present("all-features"),
             no_default_features: self._is_present("no-default-features"),
             spec,
-            filter: CompileFilter::new(
+            filter: CompileFilter::from_raw_arguments(
                 self._is_present("lib"),
                 self._values_of("bin"),
                 self._is_present("bins"),