From 0a3590566d839fc32963d4756d99aa79917a1934 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Sun, 1 Nov 2020 17:56:29 +0100 Subject: [PATCH] Fix ambiguous assert --- embassy-nrf/src/uarte.rs | 3 +-- test-build.sh | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs index 13b06397..53089507 100644 --- a/embassy-nrf/src/uarte.rs +++ b/embassy-nrf/src/uarte.rs @@ -28,8 +28,7 @@ pub use uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Parity}; use embassy::io::{AsyncBufRead, AsyncWrite, Result}; use embassy::util::WakerStore; -use anyfmt::panic; -use anyfmt::*; +use anyfmt::{assert, panic, *}; //use crate::trace; diff --git a/test-build.sh b/test-build.sh index 0b905e2c..34a56782 100755 --- a/test-build.sh +++ b/test-build.sh @@ -17,4 +17,5 @@ set -euxo pipefail (cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52833) (cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840) +(cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840,anyfmt/log) (cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840,defmt,embassy/defmt,anyfmt/defmt)