--all-features launch argument

Canop · Canop · commit efdc26682c1f · 2021-06-20T17:54:04.000+02:00
Fix #48
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bacon"
-version = "1.1.5"
+version = "1.1.6-dev"
 authors = ["dystroy <denys.seguret@gmail.com>"]
 repository = "https://github.com/Canop/bacon"
 description = "background rust compiler"
diff --git a/src/args.rs b/src/args.rs
@@ -53,6 +53,10 @@ pub struct Args {
     #[argh(switch)]
     pub no_default_features: bool,
 
+    /// activate all available features
+    #[argh(switch)]
+    pub all_features: bool,
+
     /// comma separated list of features to ask cargo to compile with
     /// (if the job defines some, they're merged)
     #[argh(option)]
@@ -91,7 +95,7 @@ impl Args {
                 }
             }
             (Some(_), Some(_), _, _) => {
-                return Err(anyhow!("Too many arguments"));
+                bail!("Too many arguments");
             }
             (Some(a), None, true, false) => {
                 self.job = Some(a);
@@ -100,7 +104,7 @@ impl Args {
                 self.path = Some(a);
             }
             (Some(a), None, false, false) => {
-                return Err(anyhow!("Unexpected argument {:?}", a));
+                bail!("Unexpected argument {:?}", a);
             }
             _ => {}
         }
diff --git a/src/executor.rs b/src/executor.rs
@@ -156,9 +156,9 @@ impl Executor {
             }
         });
         Ok(Self {
+            line_receiver,
             task_sender,
             stop_sender,
-            line_receiver,
             thread,
         })
     }
diff --git a/src/mission.rs b/src/mission.rs
@@ -38,14 +38,14 @@ impl MissionLocation {
             package_directory = match package_directory.parent() {
                 Some(dir) => dir.to_path_buf(),
                 None => {
-                    return Err(anyhow!(
+                    bail!(
                         "Cargo.toml file not found.\n\
                         bacon must be launched \n\
                         * in a rust project directory\n\
                         * or with a rust project directory given in argument\n\
                         (a rust project directory contains a Cargo.toml file or has such parent)\n\
                         "
-                    ));
+                    );
                 }
             };
         };
@@ -88,6 +88,7 @@ impl Mission {
         job_name: Option<&str>,
         settings: Settings,
     ) -> Result<Self> {
+        let package_name = location.package_name();
         let add_all_src = location.intended_is_package;
         let (job_name, job) = package_config
             .get_job(job_name)
@@ -126,12 +127,11 @@ impl Mission {
             }
         }
 
-        let cargo_execution_directory = location.package_directory.to_path_buf();
-        let package_name = location.package_name();
+        let cargo_execution_directory = location.package_directory;
         Ok(Mission {
             package_name,
-            cargo_execution_directory,
             job_name,
+            cargo_execution_directory,
             job,
             files_to_watch,
             directories_to_watch,
@@ -162,43 +162,58 @@ impl Mission {
         let mut features_done = false;
         let mut last_is_features = false;
         for arg in tokens {
-            let mut arg = arg.to_string();
             if last_is_features {
-                // arg is expected there to be the list of features
-                features_done = true;
-                match (&self.settings.features, self.settings.no_default_features) {
-                    (Some(features), false) => {
-                        // we take the features of both the job and the args
-                        arg = merge_features(&arg, &features);
-                    }
-                    (Some(features), true) => {
-                        // arg add features and remove the job ones
-                        arg = features.clone();
-                    }
-                    (None, true) => {
-                        // arg just remove the job features
-                        arg = "".to_string()
-                    }
-                    (None, false) => {
-                        // nothing to change
+                if self.settings.all_features {
+                    debug!("ignoring features given along --all-features");
+                } else {
+                    features_done = true;
+                    // arg is expected there to be the list of features
+                    match (&self.settings.features, self.settings.no_default_features) {
+                        (Some(features), false) => {
+                            // we take the features of both the job and the args
+                            command.arg("--features");
+                            command.arg(merge_features(arg, &features));
+                        }
+                        (Some(features), true) => {
+                            // arg add features and remove the job ones
+                            command.arg("--features");
+                            command.arg(&features);
+                        }
+                        (None, true) => {
+                            // we pass no feature
+                        }
+                        (None, false) => {
+                            // nothing to change
+                            command.arg("--features");
+                            command.arg(arg);
+                        }
                     }
                 }
                 last_is_features = false;
             } else if arg == "--no-default-features" {
                 no_default_features_done = true;
                 last_is_features = false;
+                command.arg(arg);
             } else if arg == "--features" {
                 last_is_features = true;
+            } else {
+                command.arg(arg);
             }
-            command.arg(arg);
         }
         if self.settings.no_default_features && !no_default_features_done {
             command.arg("--no-default-features");
         }
+        if self.settings.all_features {
+            command.arg("--all-features");
+        }
         if !features_done {
             if let Some(features) = &self.settings.features {
-                command.arg("--features");
-                command.arg(features);
+                if self.settings.all_features {
+                    debug!("not using features because of --all-features");
+                } else {
+                    command.arg("--features");
+                    command.arg(features);
+                }
             }
         }
         command.current_dir(&self.cargo_execution_directory);
@@ -220,5 +235,5 @@ fn merge_features(a: &str, b: &str) -> String {
     for feature in b.split(',') {
         features.insert(feature);
     }
-    features.iter().map(|&s|s).collect::<Vec<&str>>().join(",")
+    features.iter().copied().collect::<Vec<&str>>().join(",")
 }
diff --git a/src/package_config.rs b/src/package_config.rs
@@ -24,26 +24,26 @@ impl PackageConfig {
     pub fn from_path(path: &Path) -> Result<Self> {
         let conf = toml::from_str::<PackageConfig>(&fs::read_to_string(path)?)?;
         if conf.jobs.is_empty() {
-            return Err(anyhow!("Invalid bacon.toml : no job found"));
+            bail!("Invalid bacon.toml : no job found");
         }
         for (name, job) in &conf.jobs {
             if name.is_empty() || name.contains('.') || name.contains('/') {
-                return Err(anyhow!(
+                bail!(
                     "Invalid bacon.toml : Illegal job name : {:?}",
                     name
-                ));
+                );
             }
             if job.command.is_empty() {
-                return Err(anyhow!(
+                bail!(
                     "Invalid bacon.toml : empty command for job {:?}",
                     name
-                ));
+                );
             }
         }
         if !conf.jobs.contains_key(&conf.default_job) {
-            return Err(anyhow!(
+            bail!(
                 "Invalid bacon.toml : default job not found in jobs"
-            ));
+            );
         }
         Ok(conf)
     }
diff --git a/src/report.rs b/src/report.rs
@@ -125,6 +125,6 @@ impl Report {
         // have been read but not added (at start or end)
         let mut stats = Stats::from(&lines);
         stats.passed_tests = passed_tests;
-        Ok(Report { stats, lines })
+        Ok(Report { lines, stats })
     }
 }
diff --git a/src/settings.rs b/src/settings.rs
@@ -7,6 +7,7 @@ pub struct Settings {
     pub reverse: bool,
     pub vim_keys: bool,
     pub no_default_features: bool,
+    pub all_features: bool,
     pub features: Option<String>, // comma separated list
 }
 
@@ -47,6 +48,9 @@ impl Settings {
         if args.no_default_features {
             self.no_default_features = true;
         }
+        if args.all_features {
+            self.all_features = true;
+        }
         if args.features.is_some() {
             self.features = args.features.clone();
         }
@@ -61,6 +65,7 @@ impl Default for Settings {
             reverse: false,
             vim_keys: false,
             no_default_features: false,
+            all_features: false,
             features: None,
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ pub struct Args {`
`53`	`53`	`#[argh(switch)]`
`54`	`54`	`pub no_default_features: bool,`
`55`	`55`
	`56`	`+ /// activate all available features`
	`57`	`+ #[argh(switch)]`
	`58`	`+ pub all_features: bool,`
	`59`	`+`
`56`	`60`	`/// comma separated list of features to ask cargo to compile with`
`57`	`61`	`/// (if the job defines some, they're merged)`
`58`	`62`	`#[argh(option)]`
`@@ -91,7 +95,7 @@ impl Args {`
`91`	`95`	`}`
`92`	`96`	`}`
`93`	`97`	`(Some(_), Some(_), _, _) => {`
`94`		`- return Err(anyhow!("Too many arguments"));`
	`98`	`+ bail!("Too many arguments");`
`95`	`99`	`}`
`96`	`100`	`(Some(a), None, true, false) => {`
`97`	`101`	`self.job = Some(a);`
`@@ -100,7 +104,7 @@ impl Args {`
`100`	`104`	`self.path = Some(a);`
`101`	`105`	`}`
`102`	`106`	`(Some(a), None, false, false) => {`
`103`		`- return Err(anyhow!("Unexpected argument {:?}", a));`
	`107`	`+ bail!("Unexpected argument {:?}", a);`
`104`	`108`	`}`
`105`	`109`	`_ => {}`
`106`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,9 @@ impl Executor {`
`156`	`156`	`}`
`157`	`157`	`});`
`158`	`158`	`Ok(Self {`
	`159`	`+ line_receiver,`
`159`	`160`	`task_sender,`
`160`	`161`	`stop_sender,`
`161`		`- line_receiver,`
`162`	`162`	`thread,`
`163`	`163`	`})`
`164`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,26 +24,26 @@ impl PackageConfig {`
`24`	`24`	`pub fn from_path(path: &Path) -> Result<Self> {`
`25`	`25`	`let conf = toml::from_str::<PackageConfig>(&fs::read_to_string(path)?)?;`
`26`	`26`	`if conf.jobs.is_empty() {`
`27`		`- return Err(anyhow!("Invalid bacon.toml : no job found"));`
	`27`	`+ bail!("Invalid bacon.toml : no job found");`
`28`	`28`	`}`
`29`	`29`	`for (name, job) in &conf.jobs {`
`30`	`30`	`if name.is_empty() \|\| name.contains('.') \|\| name.contains('/') {`
`31`		`- return Err(anyhow!(`
	`31`	`+ bail!(`
`32`	`32`	`"Invalid bacon.toml : Illegal job name : {:?}",`
`33`	`33`	`name`
`34`		`- ));`
	`34`	`+ );`
`35`	`35`	`}`
`36`	`36`	`if job.command.is_empty() {`
`37`		`- return Err(anyhow!(`
	`37`	`+ bail!(`
`38`	`38`	`"Invalid bacon.toml : empty command for job {:?}",`
`39`	`39`	`name`
`40`		`- ));`
	`40`	`+ );`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`if !conf.jobs.contains_key(&conf.default_job) {`
`44`		`- return Err(anyhow!(`
	`44`	`+ bail!(`
`45`	`45`	`"Invalid bacon.toml : default job not found in jobs"`
`46`		`- ));`
	`46`	`+ );`
`47`	`47`	`}`
`48`	`48`	`Ok(conf)`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,6 @@ impl Report {`
`125`	`125`	`// have been read but not added (at start or end)`
`126`	`126`	`let mut stats = Stats::from(&lines);`
`127`	`127`	`stats.passed_tests = passed_tests;`
`128`		`- Ok(Report { stats, lines })`
	`128`	`+ Ok(Report { lines, stats })`
`129`	`129`	`}`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ pub struct Settings {`
`7`	`7`	`pub reverse: bool,`
`8`	`8`	`pub vim_keys: bool,`
`9`	`9`	`pub no_default_features: bool,`
	`10`	`+ pub all_features: bool,`
`10`	`11`	`pub features: Option<String>, // comma separated list`
`11`	`12`	`}`
`12`	`13`
`@@ -47,6 +48,9 @@ impl Settings {`
`47`	`48`	`if args.no_default_features {`
`48`	`49`	`self.no_default_features = true;`
`49`	`50`	`}`
	`51`	`+ if args.all_features {`
	`52`	`+ self.all_features = true;`
	`53`	`+ }`
`50`	`54`	`if args.features.is_some() {`
`51`	`55`	`self.features = args.features.clone();`
`52`	`56`	`}`
`@@ -61,6 +65,7 @@ impl Default for Settings {`
`61`	`65`	`reverse: false,`
`62`	`66`	`vim_keys: false,`
`63`	`67`	`no_default_features: false,`
	`68`	`+ all_features: false,`
`64`	`69`	`features: None,`
`65`	`70`	`}`
`66`	`71`	`}`