aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2020-11-01 17:56:29 +0100
committerDario Nieuwenhuis <[email protected]>2020-11-01 17:56:29 +0100
commit0a3590566d839fc32963d4756d99aa79917a1934 (patch)
tree3ac35c9227191109efc37a2019952fbe1022c87d
parent5e8608c7a5b1e4e92f1fb650ea0ef47e5a6df563 (diff)
Fix ambiguous assert
-rw-r--r--embassy-nrf/src/uarte.rs3
-rwxr-xr-xtest-build.sh1
2 files changed, 2 insertions, 2 deletions
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs
index 13b06397d..530895073 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};
28use embassy::io::{AsyncBufRead, AsyncWrite, Result}; 28use embassy::io::{AsyncBufRead, AsyncWrite, Result};
29use embassy::util::WakerStore; 29use embassy::util::WakerStore;
30 30
31use anyfmt::panic; 31use anyfmt::{assert, panic, *};
32use anyfmt::*;
33 32
34//use crate::trace; 33//use crate::trace;
35 34
diff --git a/test-build.sh b/test-build.sh
index 0b905e2cc..34a56782b 100755
--- a/test-build.sh
+++ b/test-build.sh
@@ -17,4 +17,5 @@ set -euxo pipefail
17(cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52833) 17(cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52833)
18(cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840) 18(cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840)
19 19
20(cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840,anyfmt/log)
20(cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840,defmt,embassy/defmt,anyfmt/defmt) 21(cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840,defmt,embassy/defmt,anyfmt/defmt)