max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf: add Unborrow<Target = Self> bound to all instance traits

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2021-05-15 00:05:32 +02:00
parent 8394603ea6
commit a5ad79927e
8 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-nrf/src/gpio.rs
View File

@ -331,7 +331,7 @@ pub(crate) mod sealed {
pub trait OptionalPin {} pub trait OptionalPin {}
} }
pub trait Pin: sealed::Pin + Sized { pub trait Pin: Unborrow<Target = Self> + sealed::Pin + Sized {
/// Number of the pin within the port (0..31) /// Number of the pin within the port (0..31)
#[inline] #[inline]
fn pin(&self) -> u8 { fn pin(&self) -> u8 {
@ -435,7 +435,7 @@ fn init_output<T: Pin>(pin: &T, drive: OutputDrive) {
// ==================== // ====================
pub trait OptionalPin: sealed::OptionalPin + Sized { pub trait OptionalPin: Unborrow<Target = Self> + sealed::OptionalPin + Sized {
type Pin: Pin; type Pin: Pin;
fn pin(&self) -> Option<&Self::Pin>; fn pin(&self) -> Option<&Self::Pin>;
fn pin_mut(&mut self) -> Option<&mut Self::Pin>; fn pin_mut(&mut self) -> Option<&mut Self::Pin>;

2
embassy-nrf/src/pwm.rs
View File

@ -211,7 +211,7 @@ pub(crate) mod sealed {
} }
} }
pub trait Instance: sealed::Instance + 'static { pub trait Instance: Unborrow<Target = Self> + sealed::Instance + 'static {
type Interrupt: Interrupt; type Interrupt: Interrupt;
} }

2
embassy-nrf/src/qspi.rs
View File

@ -383,7 +383,7 @@ pub(crate) mod sealed {
} }
} }
pub trait Instance: sealed::Instance + 'static { pub trait Instance: Unborrow<Target = Self> + sealed::Instance + 'static {
type Interrupt: Interrupt; type Interrupt: Interrupt;
} }

4
embassy-nrf/src/rtc.rs
View File

@ -3,7 +3,7 @@ use core::sync::atomic::{compiler_fence, AtomicU32, Ordering};
use critical_section::CriticalSection; use critical_section::CriticalSection;
use embassy::interrupt::InterruptExt; use embassy::interrupt::InterruptExt;
use embassy::time::Clock; use embassy::time::Clock;
use embassy::util::CriticalSectionMutex as Mutex; use embassy::util::{CriticalSectionMutex as Mutex, Unborrow};
use crate::interrupt::Interrupt; use crate::interrupt::Interrupt;
use crate::pac; use crate::pac;
@ -283,7 +283,7 @@ macro_rules! impl_instance {
} }
/// Implemented by all RTC instances. /// Implemented by all RTC instances.
pub trait Instance: sealed::Instance + 'static { pub trait Instance: Unborrow<Target = Self> + sealed::Instance + 'static {
/// The interrupt associated with this RTC instance. /// The interrupt associated with this RTC instance.
type Interrupt: Interrupt; type Interrupt: Interrupt;
} }

2
embassy-nrf/src/spim.rs
View File

@ -349,7 +349,7 @@ pub(crate) mod sealed {
} }
} }
pub trait Instance: sealed::Instance + 'static { pub trait Instance: Unborrow<Target = Self> + sealed::Instance + 'static {
type Interrupt: Interrupt; type Interrupt: Interrupt;
} }

3
embassy-nrf/src/timer.rs
View File

@ -1,6 +1,7 @@
#![macro_use] #![macro_use]
use embassy::interrupt::Interrupt; use embassy::interrupt::Interrupt;
use embassy::util::Unborrow;
use crate::pac; use crate::pac;
@ -13,7 +14,7 @@ pub(crate) mod sealed {
pub trait ExtendedInstance {} pub trait ExtendedInstance {}
} }
pub trait Instance: sealed::Instance + 'static { pub trait Instance: Unborrow<Target = Self> + sealed::Instance + 'static {
type Interrupt: Interrupt; type Interrupt: Interrupt;
} }
pub trait ExtendedInstance: Instance + sealed::ExtendedInstance {} pub trait ExtendedInstance: Instance + sealed::ExtendedInstance {}

2
embassy-nrf/src/twim.rs
View File

@ -509,7 +509,7 @@ pub(crate) mod sealed {
} }
} }
pub trait Instance: sealed::Instance + 'static { pub trait Instance: Unborrow<Target = Self> + sealed::Instance + 'static {
type Interrupt: Interrupt; type Interrupt: Interrupt;
} }

2
embassy-nrf/src/uarte.rs
View File

@ -469,7 +469,7 @@ pub(crate) mod sealed {
} }
} }
pub trait Instance: sealed::Instance + 'static { pub trait Instance: Unborrow<Target = Self> + sealed::Instance + 'static {
type Interrupt: Interrupt; type Interrupt: Interrupt;
} }