mirror of
https://github.com/rtic-rs/rtic.git
synced 2024-11-27 14:04:56 +01:00
Add support for "feature mixer"
This commit is contained in:
parent
622a58db5a
commit
feb00a9755
2 changed files with 104 additions and 39 deletions
|
@ -46,11 +46,45 @@ impl Package {
|
||||||
/// Without package specified the features for RTIC are required
|
/// Without package specified the features for RTIC are required
|
||||||
/// With only a single package which is not RTIC, no special
|
/// With only a single package which is not RTIC, no special
|
||||||
/// features are needed
|
/// features are needed
|
||||||
pub fn extract_features(&self, target: Target, backend: Backends) -> Option<String> {
|
pub fn features(
|
||||||
|
&self,
|
||||||
|
target: Target,
|
||||||
|
backend: Backends,
|
||||||
|
partial: bool,
|
||||||
|
) -> Vec<Option<String>> {
|
||||||
match self {
|
match self {
|
||||||
Package::Rtic => Some(target.and_features(backend.to_rtic_feature())),
|
Package::Rtic => vec![Some(target.and_features(backend.to_rtic_feature()))],
|
||||||
Package::RticMacros => Some(backend.to_rtic_macros_feature().to_owned()),
|
Package::RticMacros => {
|
||||||
_ => None,
|
vec![Some(backend.to_rtic_macros_feature().to_string())]
|
||||||
|
}
|
||||||
|
Package::RticMonotonics => {
|
||||||
|
let features = if partial {
|
||||||
|
&["cortex-m-systick", "rp2040", "nrf52840"][..]
|
||||||
|
} else {
|
||||||
|
&[
|
||||||
|
"cortex-m-systick",
|
||||||
|
"cortex-m-systick,systick-100hz",
|
||||||
|
"cortex-m-systick,systick-10khz",
|
||||||
|
"rp2040",
|
||||||
|
"nrf52810",
|
||||||
|
"nrf52811",
|
||||||
|
"nrf52832",
|
||||||
|
"nrf52833",
|
||||||
|
"nrf52840",
|
||||||
|
"nrf5340-app",
|
||||||
|
"nrf5340-net",
|
||||||
|
"nrf9160",
|
||||||
|
][..]
|
||||||
|
};
|
||||||
|
|
||||||
|
features
|
||||||
|
.into_iter()
|
||||||
|
.map(ToString::to_string)
|
||||||
|
.map(Some)
|
||||||
|
.chain(std::iter::once(None))
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
_ => vec![None],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -189,6 +223,11 @@ pub struct Globals {
|
||||||
/// clutter, but can make debugging long-running processes a lot easier.
|
/// clutter, but can make debugging long-running processes a lot easier.
|
||||||
#[arg(short, long, global = true)]
|
#[arg(short, long, global = true)]
|
||||||
pub stderr_inherited: bool,
|
pub stderr_inherited: bool,
|
||||||
|
|
||||||
|
/// Don't build/check/test all feature combinations that are available, only
|
||||||
|
/// a necessary subset.
|
||||||
|
#[arg(long, global = true)]
|
||||||
|
pub partial: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
|
|
|
@ -86,10 +86,23 @@ pub fn cargo<'c>(
|
||||||
package: &'c PackageOpt,
|
package: &'c PackageOpt,
|
||||||
backend: Backends,
|
backend: Backends,
|
||||||
) -> Vec<FinalRunResult<'c>> {
|
) -> Vec<FinalRunResult<'c>> {
|
||||||
let runner = package.packages().map(move |package| {
|
let runner = package
|
||||||
|
.packages()
|
||||||
|
.flat_map(|package| {
|
||||||
let target = backend.to_target();
|
let target = backend.to_target();
|
||||||
let features = package.extract_features(target, backend);
|
let features = package.features(target, backend, globals.partial);
|
||||||
|
|
||||||
|
#[cfg(feature = "rayon")]
|
||||||
|
{
|
||||||
|
features.into_par_iter().map(move |f| (package, target, f))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(feature = "rayon"))]
|
||||||
|
{
|
||||||
|
features.into_iter().map(move |f| (package, target, f))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.map(move |(package, target, features)| {
|
||||||
let command = match operation {
|
let command = match operation {
|
||||||
BuildOrCheck::Check => CargoCommand::Check {
|
BuildOrCheck::Check => CargoCommand::Check {
|
||||||
cargoarg,
|
cargoarg,
|
||||||
|
@ -154,15 +167,28 @@ pub fn cargo_clippy<'c>(
|
||||||
package: &'c PackageOpt,
|
package: &'c PackageOpt,
|
||||||
backend: Backends,
|
backend: Backends,
|
||||||
) -> Vec<FinalRunResult<'c>> {
|
) -> Vec<FinalRunResult<'c>> {
|
||||||
let runner = package.packages().map(|p| {
|
let runner = package
|
||||||
|
.packages()
|
||||||
|
.flat_map(|package| {
|
||||||
let target = backend.to_target();
|
let target = backend.to_target();
|
||||||
let features = p.extract_features(target, backend);
|
let features = package.features(target, backend, globals.partial);
|
||||||
|
|
||||||
|
#[cfg(feature = "rayon")]
|
||||||
|
{
|
||||||
|
features.into_par_iter().map(move |f| (package, target, f))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(feature = "rayon"))]
|
||||||
|
{
|
||||||
|
features.into_iter().map(move |f| (package, target, f))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.map(move |(package, target, features)| {
|
||||||
(
|
(
|
||||||
globals,
|
globals,
|
||||||
CargoCommand::Clippy {
|
CargoCommand::Clippy {
|
||||||
cargoarg,
|
cargoarg,
|
||||||
package: Some(p),
|
package: Some(package),
|
||||||
target,
|
target,
|
||||||
features,
|
features,
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue