Skip to content

Commit 9365ca8

Browse files
committed
delay: make infallible.
1 parent 812471b commit 9365ca8

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

embedded-hal-async/src/delay.rs

+4-9
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,24 @@
22
33
/// Microsecond delay
44
pub trait DelayUs {
5-
/// Enumeration of errors
6-
type Error: core::fmt::Debug;
7-
85
/// Pauses execution for at minimum `us` microseconds. Pause can be longer
96
/// if the implementation requires it due to precision/timing issues.
10-
async fn delay_us(&mut self, us: u32) -> Result<(), Self::Error>;
7+
async fn delay_us(&mut self, us: u32);
118

129
/// Pauses execution for at minimum `ms` milliseconds. Pause can be longer
1310
/// if the implementation requires it due to precision/timing issues.
14-
async fn delay_ms(&mut self, ms: u32) -> Result<(), Self::Error>;
11+
async fn delay_ms(&mut self, ms: u32);
1512
}
1613

1714
impl<T> DelayUs for &mut T
1815
where
1916
T: DelayUs,
2017
{
21-
type Error = T::Error;
22-
23-
async fn delay_us(&mut self, us: u32) -> Result<(), Self::Error> {
18+
async fn delay_us(&mut self, us: u32) {
2419
T::delay_us(self, us).await
2520
}
2621

27-
async fn delay_ms(&mut self, ms: u32) -> Result<(), Self::Error> {
22+
async fn delay_ms(&mut self, ms: u32) {
2823
T::delay_ms(self, ms).await
2924
}
3025
}

embedded-hal/src/delay.rs

+5-12
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,28 @@
33
/// Microsecond delay
44
///
55
pub trait DelayUs {
6-
/// Enumeration of `DelayUs` errors
7-
type Error: core::fmt::Debug;
8-
96
/// Pauses execution for at minimum `us` microseconds. Pause can be longer
107
/// if the implementation requires it due to precision/timing issues.
11-
fn delay_us(&mut self, us: u32) -> Result<(), Self::Error>;
8+
fn delay_us(&mut self, us: u32);
129

1310
/// Pauses execution for at minimum `ms` milliseconds. Pause can be longer
1411
/// if the implementation requires it due to precision/timing issues.
15-
fn delay_ms(&mut self, ms: u32) -> Result<(), Self::Error> {
12+
fn delay_ms(&mut self, ms: u32) {
1613
for _ in 0..ms {
17-
self.delay_us(1000)?;
14+
self.delay_us(1000);
1815
}
19-
20-
Ok(())
2116
}
2217
}
2318

2419
impl<T> DelayUs for &mut T
2520
where
2621
T: DelayUs,
2722
{
28-
type Error = T::Error;
29-
30-
fn delay_us(&mut self, us: u32) -> Result<(), Self::Error> {
23+
fn delay_us(&mut self, us: u32) {
3124
T::delay_us(self, us)
3225
}
3326

34-
fn delay_ms(&mut self, ms: u32) -> Result<(), Self::Error> {
27+
fn delay_ms(&mut self, ms: u32) {
3528
T::delay_ms(self, ms)
3629
}
3730
}

0 commit comments

Comments
 (0)