Actually chain these

This commit is contained in:
datdenkikniet 2023-04-16 13:27:54 +02:00
parent 319c2263f3
commit 0ee2d2c2db

View file

@ -418,11 +418,12 @@ pub fn build_and_check_size<'c>(
let target = backend.to_target(); let target = backend.to_target();
let features = Some(target.and_features(backend.to_rtic_feature())); let features = Some(target.and_features(backend.to_rtic_feature()));
let runner = into_iter(examples).map(|example| { let runner = into_iter(examples)
.flat_map(|example| {
let target = target.into(); let target = target.into();
// Make sure the requested example(s) are built // Make sure the requested example(s) are built
let cmd = CargoCommand::ExampleBuild { let cmd_build = CargoCommand::ExampleBuild {
cargoarg: &Some("--quiet"), cargoarg: &Some("--quiet"),
example, example,
target, target,
@ -432,11 +433,7 @@ pub fn build_and_check_size<'c>(
deny_warnings: globals.deny_warnings, deny_warnings: globals.deny_warnings,
}; };
if let Err(err) = command_parser(globals, &cmd, false) { let cmd_size = CargoCommand::ExampleSize {
error!("{err}");
}
let cmd = CargoCommand::ExampleSize {
cargoarg, cargoarg,
example, example,
target, target,
@ -445,8 +442,10 @@ pub fn build_and_check_size<'c>(
arguments: arguments.clone(), arguments: arguments.clone(),
dir: Some(PathBuf::from("./rtic")), dir: Some(PathBuf::from("./rtic")),
}; };
(globals, cmd, false)
}); [cmd_build, cmd_size]
})
.map(|cmd| (globals, cmd, false));
runner.run_and_coalesce() runner.run_and_coalesce()
} }