Merge #350

350: Update bare-metal dependency r=adamgreig a=hellow554

Bare-metal has released its 1.0 version. Let's use it!

Co-authored-by: Marcel Hellwig <[email protected]>
Co-authored-by: Marcel Hellwig <[email protected]>
Co-authored-by: Adam Greig <[email protected]>

Author: 3 people

Cargo.toml

@@ -16,7 +16,7 @@ edition = "2018"
 links = "cortex-m"  # prevent multiple versions of this crate to be linked together
 
 [dependencies]
-bare-metal = { version = "0.2.4", features = ["const-fn"] }
+bare-metal = "1"
 volatile-register = "0.2.0"
 bitfield = "0.13.2"
 embedded-hal = "0.2.4"

src/interrupt.rs

@@ -1,6 +1,6 @@
 //! Interrupts
 
-pub use bare_metal::{CriticalSection, Mutex, Nr};
+pub use bare_metal::{CriticalSection, Mutex};
 
 /// Trait for enums of external interrupt numbers.
 ///
@@ -23,15 +23,6 @@ pub unsafe trait InterruptNumber: Copy {
     fn number(self) -> u16;
 }
 
-/// Implement InterruptNumber for the old bare_metal::Nr trait.
-/// This implementation is for backwards compatibility only and will be removed in cortex-m 0.8.
-unsafe impl<T: Nr + Copy> InterruptNumber for T {
-    #[inline]
-    fn number(self) -> u16 {
-        self.nr() as u16
-    }
-}
-
 /// Disables all interrupts
 #[inline]
 pub fn disable() {