diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2021-12-31 17:45:01 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-12-31 17:45:01 +0000 |
| commit | 42065a6864a00f9f7d47fe8fd123c2f175362d37 (patch) | |
| tree | 1f3cf84dbe58ac8efbc1619f292c0dc485c08ece | |
| parent | 08452a9de25e4bc66fb80015e0c78c08eb967237 (diff) | |
| parent | 819f8be6c64c233ce65b12f27e0efd82833a6897 (diff) | |
| download | cortex-m-42065a6864a00f9f7d47fe8fd123c2f175362d37.tar.gz cortex-m-42065a6864a00f9f7d47fe8fd123c2f175362d37.tar.zst cortex-m-42065a6864a00f9f7d47fe8fd123c2f175362d37.zip | |
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 <github@cookiesoft.de>
Co-authored-by: Marcel Hellwig <git@cookiesoft.de>
Co-authored-by: Adam Greig <adam@adamgreig.com>
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | src/interrupt.rs | 11 |
2 files changed, 2 insertions, 11 deletions
@@ -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" diff --git a/src/interrupt.rs b/src/interrupt.rs index 0fd1284..68719ec 100644 --- a/src/interrupt.rs +++ b/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() { |