Actually chain these

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

View file

@ -418,35 +418,34 @@ 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)
let target = target.into(); .flat_map(|example| {
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,
features: features.clone(), features: features.clone(),
mode: BuildMode::Release, mode: BuildMode::Release,
dir: Some(PathBuf::from("./rtic")), dir: Some(PathBuf::from("./rtic")),
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}"); cargoarg,
} example,
target,
features: features.clone(),
mode: BuildMode::Release,
arguments: arguments.clone(),
dir: Some(PathBuf::from("./rtic")),
};
let cmd = CargoCommand::ExampleSize { [cmd_build, cmd_size]
cargoarg, })
example, .map(|cmd| (globals, cmd, false));
target,
features: features.clone(),
mode: BuildMode::Release,
arguments: arguments.clone(),
dir: Some(PathBuf::from("./rtic")),
};
(globals, cmd, false)
});
runner.run_and_coalesce() runner.run_and_coalesce()
} }