aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar datdenkikniet <jcdra1@gmail.com> 2023-04-16 13:27:54 +0200
committerGravatar datdenkikniet <jcdra1@gmail.com> 2023-04-16 13:27:54 +0200
commit0ee2d2c2dbd794dd5f77281de3368c22ea4e7e33 (patch)
tree894477ae7f77df399c9f665007ef76f0720c68fe
parent319c2263f3cebd5d990ba5fee277ec9cf1b1d2f9 (diff)
downloadrtic-0ee2d2c2dbd794dd5f77281de3368c22ea4e7e33.tar.gz
rtic-0ee2d2c2dbd794dd5f77281de3368c22ea4e7e33.tar.zst
rtic-0ee2d2c2dbd794dd5f77281de3368c22ea4e7e33.zip
Actually chain these
-rw-r--r--xtask/src/run.rs53
1 files changed, 26 insertions, 27 deletions
diff --git a/xtask/src/run.rs b/xtask/src/run.rs
index 74179c56..13d2e22e 100644
--- a/xtask/src/run.rs
+++ b/xtask/src/run.rs
@@ -418,35 +418,34 @@ pub fn build_and_check_size<'c>(
let target = backend.to_target();
let features = Some(target.and_features(backend.to_rtic_feature()));
- let runner = into_iter(examples).map(|example| {
- let target = target.into();
-
- // Make sure the requested example(s) are built
- let cmd = CargoCommand::ExampleBuild {
- cargoarg: &Some("--quiet"),
- example,
- target,
- features: features.clone(),
- mode: BuildMode::Release,
- dir: Some(PathBuf::from("./rtic")),
- deny_warnings: globals.deny_warnings,
- };
+ let runner = into_iter(examples)
+ .flat_map(|example| {
+ let target = target.into();
- if let Err(err) = command_parser(globals, &cmd, false) {
- error!("{err}");
- }
+ // Make sure the requested example(s) are built
+ let cmd_build = CargoCommand::ExampleBuild {
+ cargoarg: &Some("--quiet"),
+ example,
+ target,
+ features: features.clone(),
+ mode: BuildMode::Release,
+ dir: Some(PathBuf::from("./rtic")),
+ deny_warnings: globals.deny_warnings,
+ };
- let cmd = CargoCommand::ExampleSize {
- cargoarg,
- example,
- target,
- features: features.clone(),
- mode: BuildMode::Release,
- arguments: arguments.clone(),
- dir: Some(PathBuf::from("./rtic")),
- };
- (globals, cmd, false)
- });
+ let cmd_size = CargoCommand::ExampleSize {
+ cargoarg,
+ example,
+ target,
+ features: features.clone(),
+ mode: BuildMode::Release,
+ arguments: arguments.clone(),
+ dir: Some(PathBuf::from("./rtic")),
+ };
+
+ [cmd_build, cmd_size]
+ })
+ .map(|cmd| (globals, cmd, false));
runner.run_and_coalesce()
}