diff options
| -rw-r--r-- | .github/workflows/build.yml | 12 | ||||
| -rw-r--r-- | rtic-monotonics/src/rp2040.rs | 2 | ||||
| -rw-r--r-- | rtic-monotonics/src/systick.rs | 2 | ||||
| -rw-r--r-- | rtic/examples/async-delay.rs | 2 | ||||
| -rw-r--r-- | rtic/examples/async-timeout.rs | 2 | ||||
| -rw-r--r-- | xtask/src/main.rs | 9 |
6 files changed, 14 insertions, 15 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e84de651..aadb0a97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: - name: Cache Dependencies uses: Swatinem/rust-cache@v2 - - run: cargo xtask --verbose --backend ${{ matrix.backend }} check + - run: cargo xtask --backend ${{ matrix.backend }} check # Clippy clippy: @@ -107,7 +107,7 @@ jobs: - name: Cache Dependencies uses: Swatinem/rust-cache@v2 - - run: cargo xtask --verbose --backend ${{ matrix.backend }} clippy + - run: cargo xtask --backend ${{ matrix.backend }} clippy # Verify all examples, checks checkexamples: @@ -142,11 +142,11 @@ jobs: - name: Check the examples if: ${{ matrix.backend == 'thumbv8-base' }} - run: cargo xtask --verbose --backend ${{ matrix.backend }} --exampleexclude pool example-check + run: cargo xtask --backend ${{ matrix.backend }} --exampleexclude pool example-check - name: Check the examples if: ${{ matrix.backend != 'thumbv8-base' }} - run: cargo xtask --verbose --backend ${{ matrix.backend }} example-check + run: cargo xtask --backend ${{ matrix.backend }} example-check # Verify the example output with run-pass tests testexamples: @@ -195,7 +195,7 @@ jobs: run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs - name: Run-pass tests - run: cargo xtask --verbose --backend ${{ matrix.backend }} qemu + run: cargo xtask --backend ${{ matrix.backend }} qemu # Run test suite tests: @@ -235,7 +235,7 @@ jobs: run: find . -type f -name lib.rs -execdir sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' {} + - name: Run cargo test - run: cargo xtask --verbose --backend ${{ matrix.backend }} test ${{ matrix.package }} + run: cargo xtask --backend ${{ matrix.backend }} test ${{ matrix.package }} # Build documentation, check links docs: diff --git a/rtic-monotonics/src/rp2040.rs b/rtic-monotonics/src/rp2040.rs index 6aa66ce0..9d2f4f35 100644 --- a/rtic-monotonics/src/rp2040.rs +++ b/rtic-monotonics/src/rp2040.rs @@ -138,7 +138,7 @@ impl embedded_hal_async::delay::DelayUs for Timer { /// Register the Timer interrupt for the monotonic. #[macro_export] -macro_rules! make_rp2040_monotonic_handler { +macro_rules! create_rp2040_monotonic_token { () => {{ #[no_mangle] #[allow(non_snake_case)] diff --git a/rtic-monotonics/src/systick.rs b/rtic-monotonics/src/systick.rs index b228e204..f4345d43 100644 --- a/rtic-monotonics/src/systick.rs +++ b/rtic-monotonics/src/systick.rs @@ -156,7 +156,7 @@ impl embedded_hal_async::delay::DelayUs for Systick { /// Register the Systick interrupt for the monotonic. #[macro_export] -macro_rules! make_systick_handler { +macro_rules! create_systick_token { () => {{ #[no_mangle] #[allow(non_snake_case)] diff --git a/rtic/examples/async-delay.rs b/rtic/examples/async-delay.rs index 7b3667b0..cdffa620 100644 --- a/rtic/examples/async-delay.rs +++ b/rtic/examples/async-delay.rs @@ -24,7 +24,7 @@ mod app { fn init(cx: init::Context) -> (Shared, Local) { hprintln!("init"); - let systick_token = rtic_monotonics::make_systick_handler!(); + let systick_token = rtic_monotonics::create_systick_token!(); Systick::start(cx.core.SYST, 12_000_000, systick_token); foo::spawn().ok(); diff --git a/rtic/examples/async-timeout.rs b/rtic/examples/async-timeout.rs index e07e9c6f..7690408e 100644 --- a/rtic/examples/async-timeout.rs +++ b/rtic/examples/async-timeout.rs @@ -27,7 +27,7 @@ mod app { fn init(cx: init::Context) -> (Shared, Local) { hprintln!("init"); - let systick_token = rtic_monotonics::make_systick_handler!(); + let systick_token = rtic_monotonics::create_systick_token!(); Systick::start(cx.core.SYST, 12_000_000, systick_token); foo::spawn().ok(); diff --git a/xtask/src/main.rs b/xtask/src/main.rs index aed74eb5..a7fd1d32 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -109,9 +109,8 @@ fn main() -> anyhow::Result<()> { let cli = Cli::parse(); let env_logger_default_level = match cli.verbose { - 0 => Env::default().default_filter_or("error"), - 1 => Env::default().default_filter_or("info"), - 2 => Env::default().default_filter_or("debug"), + 0 => Env::default().default_filter_or("info"), + 1 => Env::default().default_filter_or("debug"), _ => Env::default().default_filter_or("trace"), }; env_logger::Builder::from_env(env_logger_default_level) @@ -188,12 +187,12 @@ fn main() -> anyhow::Result<()> { match cli.command { Commands::FormatCheck(args) => { - info!("Running cargo fmt: {args:?}"); + info!("Running cargo fmt --check: {args:?}"); let check_only = true; cargo_format(&cargologlevel, &args, check_only)?; } Commands::Format(args) => { - info!("Running cargo fmt --check: {args:?}"); + info!("Running cargo fmt: {args:?}"); let check_only = false; cargo_format(&cargologlevel, &args, check_only)?; } |