Merge #437

437: Bump cortex-m to 0.7.0 r=korken89 a=nickray



Co-authored-by: Nicolas Stalder <n@stalder.io>

2 files changed, 6 insertions, 3 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 9a10ec27..fee6485a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -55,7 +55,7 @@ name = "double_schedule"
 required-features = ["__v7"]
 
 [dependencies]
-cortex-m = "0.6.2"
+cortex-m = "0.7.0"
 cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" }
 rtic-core = "0.3.1"
 heapless = "0.5.0"
@@ -105,3 +105,6 @@ debug = false
 debug-assertions = false
 opt-level = 0
 overflow-checks = false
+
+[patch.crates-io]
+lm3s6965 = { git = "https://github.com/japaric/lm3s6965" }
diff --git a/src/lib.rs b/src/lib.rs
index f1fb550b..360ea91d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -38,7 +38,7 @@
 use core::ops::Sub;
 
 use cortex_m::{
-    interrupt::Nr,
+    interrupt::InterruptNumber,
     peripheral::{CBP, CPUID, DCB, DWT, FPB, FPU, ITM, MPU, NVIC, SCB, TPIU},
 };
 pub use cortex_m_rtic_macros::app;
@@ -158,7 +158,7 @@ pub trait Monotonic {
 /// [`NVIC::pend`](../cortex_m/peripheral/struct.NVIC.html#method.pend)
 pub fn pend<I>(interrupt: I)
 where
-    I: Nr,
+    I: InterruptNumber,
 {
     NVIC::pend(interrupt)
 }