xtask: Rename cargoarg to cargologlevel

This commit is contained in:
Henrik Tjäder 2023-02-24 23:31:49 +01:00
parent ff49889890
commit 91be97d33f

View file

@ -315,7 +315,7 @@ fn main() -> anyhow::Result<()> {
init_build_dir()?; init_build_dir()?;
#[allow(clippy::if_same_then_else)] #[allow(clippy::if_same_then_else)]
let cargoarg = if log_enabled!(Level::Trace) { let cargologlevel = if log_enabled!(Level::Trace) {
Some("-v") Some("-v")
} else if log_enabled!(Level::Debug) { } else if log_enabled!(Level::Debug) {
None None
@ -332,38 +332,38 @@ fn main() -> anyhow::Result<()> {
Commands::FormatCheck(args) => { Commands::FormatCheck(args) => {
info!("Running cargo fmt: {args:?}"); info!("Running cargo fmt: {args:?}");
let check_only = true; let check_only = true;
cargo_format(&cargoarg, &args, check_only)?; cargo_format(&cargologlevel, &args, check_only)?;
} }
Commands::Format(args) => { Commands::Format(args) => {
info!("Running cargo fmt --check: {args:?}"); info!("Running cargo fmt --check: {args:?}");
let check_only = false; let check_only = false;
cargo_format(&cargoarg, &args, check_only)?; cargo_format(&cargologlevel, &args, check_only)?;
} }
Commands::Clippy(args) => { Commands::Clippy(args) => {
info!("Running clippy on backend: {backend:?}"); info!("Running clippy on backend: {backend:?}");
cargo_clippy(&cargoarg, &args, backend)?; cargo_clippy(&cargologlevel, &args, backend)?;
} }
Commands::Check(args) => { Commands::Check(args) => {
info!("Checking on backend: {backend:?}"); info!("Checking on backend: {backend:?}");
cargo_check(&cargoarg, &args, backend)?; cargo(&cli.command, &cargologlevel, &args, backend)?;
} }
Commands::Build(args) => { Commands::Build(args) => {
info!("Building for backend: {backend:?}"); info!("Building for backend: {backend:?}");
cargo_build(&cargoarg, &args, backend)?; cargo_build(&cargologlevel, &args, backend)?;
} }
Commands::ExampleCheck => { Commands::ExampleCheck => {
info!("Checking on backend: {backend:?}"); info!("Checking on backend: {backend:?}");
example_check(&cargoarg, backend, &examples_to_run)?; example_check(&cargologlevel, backend, &examples_to_run)?;
} }
Commands::ExampleBuild => { Commands::ExampleBuild => {
info!("Building for backend: {backend:?}"); info!("Building for backend: {backend:?}");
example_build(&cargoarg, backend, &examples_to_run)?; example_build(&cargologlevel, backend, &examples_to_run)?;
} }
Commands::Size(arguments) => { Commands::Size(arguments) => {
// x86_64 target not valid // x86_64 target not valid
info!("Measuring for backend: {backend:?}"); info!("Measuring for backend: {backend:?}");
build_and_check_size( build_and_check_size(
&cargoarg, &cargologlevel,
backend, backend,
&examples_to_run, &examples_to_run,
&arguments.sizearguments, &arguments.sizearguments,
@ -373,7 +373,7 @@ fn main() -> anyhow::Result<()> {
// x86_64 target not valid // x86_64 target not valid
info!("Testing for backend: {backend:?}"); info!("Testing for backend: {backend:?}");
run_test( run_test(
&cargoarg, &cargologlevel,
backend, backend,
&examples_to_run, &examples_to_run,
args.overwrite_expected, args.overwrite_expected,
@ -381,7 +381,7 @@ fn main() -> anyhow::Result<()> {
} }
Commands::Doc => { Commands::Doc => {
info!("Running cargo doc on backend: {backend:?}"); info!("Running cargo doc on backend: {backend:?}");
cargo_doc(&cargoarg, backend)?; cargo_doc(&cargologlevel, backend)?;
} }
} }