Merge pull request #9 from YuhanLiin/bump-bare-metal

Bump bare metal to 1.0.0

Author: cr1901

CHANGELOG.md

@@ -7,9 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+- Bumped `bare-metal` to version `1.0.0`.
+
 ### Removed
 - `enable_cs` removed due to soundness hole when interacting with `Clone` and
   `interrupt::free`.
+- Remove `peripherals` module since the peripheral API is no longer provided by
+  `bare-metal`.
 
 ## [v0.2.2] - 2020-04-23
 

Cargo.toml

@@ -10,5 +10,4 @@ repository = "https://github.com/rust-embedded/msp430"
 version = "0.3.0"
 
 [dependencies.bare-metal]
-features = ["const-fn"]
-version = "0.2.0"
+version = "1.0.0"

src/interrupt.rs

@@ -23,7 +23,7 @@ pub fn disable() {
 ///
 /// # Safety
 ///
-/// - In any function `f()` that calls `enable`, `CriticalSection` or `&CriticalSection` tokens cannot be used in `f()`'s body after the 
+/// - In any function `f()` that calls `enable`, `CriticalSection` or `&CriticalSection` tokens cannot be used in `f()`'s body after the
 ///   call to `enable`. If `f()` owns `CriticalSection` tokens, it is recommended to [`drop`](https://doc.rust-lang.org/nightly/core/mem/fn.drop.html)
 ///   these tokens before calling `enable`.
 #[inline(always)]
@@ -47,14 +47,15 @@ pub unsafe fn enable() {
 /// This as also known as a "critical section".
 pub fn free<F, R>(f: F) -> R
 where
-    F: FnOnce(&CriticalSection) -> R,
+    F: for<'a> FnOnce(&'a CriticalSection<'a>) -> R,
 {
     let status = ::register::sr::read();
 
     // disable interrupts
     disable();
 
-    let r = f(unsafe { &CriticalSection::new() });
+    let cs = unsafe { CriticalSection::new() };
+    let r = f(&cs);
 
     // If the interrupts were active before our `disable` call, then re-enable
     // them. Otherwise, keep them disabled

src/lib.rs

@@ -18,5 +18,4 @@ extern crate bare_metal;
 #[macro_use]
 pub mod asm;
 pub mod interrupt;
-pub mod peripheral;
 pub mod register;