move most interrupt methods to InterruptExt extension trait. Fixes #35

5 files changed, 6 insertions, 1 deletions

diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs
index 26a40507b..5cbba486e 100644
--- a/embassy-nrf/src/buffered_uarte.rs
+++ b/embassy-nrf/src/buffered_uarte.rs
@@ -10,6 +10,7 @@ use core::ops::Deref;
 use core::pin::Pin;
 use core::sync::atomic::{compiler_fence, Ordering};
 use core::task::{Context, Poll};
+use embassy::interrupt::InterruptExt;
 use embassy::io::{AsyncBufRead, AsyncWrite, Result};
 use embassy::util::WakerRegistration;
 use embedded_hal::digital::v2::OutputPin;
diff --git a/embassy-nrf/src/gpiote.rs b/embassy-nrf/src/gpiote.rs
index 01e61bd5c..78bb2aeb6 100644
--- a/embassy-nrf/src/gpiote.rs
+++ b/embassy-nrf/src/gpiote.rs
@@ -5,11 +5,11 @@ use core::pin::Pin;
 use core::ptr;
 use core::task::{Context, Poll};
 use embassy::gpio::{WaitForHigh, WaitForLow};
+use embassy::interrupt::InterruptExt;
 use embassy::util::Signal;
 
 use crate::hal::gpio::{Input, Level, Output, Pin as GpioPin, Port};
 use crate::interrupt;
-use crate::interrupt::Interrupt;
 use crate::pac;
 use crate::pac::generic::Reg;
 use crate::pac::gpiote::_TASKS_OUT;
diff --git a/embassy-nrf/src/rtc.rs b/embassy-nrf/src/rtc.rs
index 7a79580cc..e0e645fe8 100644
--- a/embassy-nrf/src/rtc.rs
+++ b/embassy-nrf/src/rtc.rs
@@ -2,6 +2,7 @@ use core::cell::Cell;
 use core::ops::Deref;
 use core::sync::atomic::{compiler_fence, AtomicU32, Ordering};
 
+use embassy::interrupt::InterruptExt;
 use embassy::time::Clock;
 
 use crate::interrupt;
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs
index 07718a1dd..9d5ff81aa 100644
--- a/embassy-nrf/src/uarte.rs
+++ b/embassy-nrf/src/uarte.rs
@@ -9,6 +9,7 @@ use core::ops::Deref;
 use core::sync::atomic::{compiler_fence, Ordering};
 use core::task::{Context, Poll};
 
+use embassy::interrupt::InterruptExt;
 use embassy::util::Signal;
 
 use crate::fmt::{assert, *};
diff --git a/embassy-nrf/src/util/peripheral.rs b/embassy-nrf/src/util/peripheral.rs
index bfb023f56..bb88f0820 100644
--- a/embassy-nrf/src/util/peripheral.rs
+++ b/embassy-nrf/src/util/peripheral.rs
@@ -4,6 +4,8 @@ use core::mem::MaybeUninit;
 use core::pin::Pin;
 use core::sync::atomic::{compiler_fence, Ordering};
 
+use embassy::interrupt::InterruptExt;
+
 use crate::fmt::{assert, *};
 use crate::interrupt::Interrupt;