Re-applying some partial fixes

Contains partial commits from rust-embedded#490, rust-embedded#534, rust-embedded#544, and rust-embedded#562.

Author: thejpster

cortex-m/CHANGELOG.md

@@ -7,7 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-- MSRV is 1.61 to match cortex-m-rt crate
+## Changed
+
+- Bumped MSRV to 1.61 for compatibility with syn versions >=2.0.68 and to match cortex-m-rt crate
+
+### Added
+
+- Added `set_sevonpend` and `clear_sevonpend` (#539).
 
 ## [v0.7.7] - 2023-01-03
 

cortex-m/Cargo.toml

@@ -20,7 +20,7 @@ rust-version = "1.61"
 bare-metal = { version = "0.2.4", features = ["const-fn"] }
 critical-section = { version = "1.0.0", optional = true }
 volatile-register = "0.2.2"
-bitfield = "0.13.2"
+bitfield = "0.15.0"
 embedded-hal = "0.2.4"
 
 [dependencies.serde]

cortex-m/src/itm.rs

@@ -57,7 +57,7 @@ unsafe fn write_aligned_impl(port: &mut Stim, buffer: &[u8]) {
 
 struct Port<'p>(&'p mut Stim);
 
-impl<'p> fmt::Write for Port<'p> {
+impl fmt::Write for Port<'_> {
     #[inline]
     fn write_str(&mut self, s: &str) -> fmt::Result {
         write_all(self.0, s.as_bytes());

cortex-m/src/lib.rs

@@ -63,7 +63,7 @@
 //!
 //! # Minimum Supported Rust Version (MSRV)
 //!
-//! This crate is guaranteed to compile on stable Rust 1.59 and up. It *might*
+//! This crate is guaranteed to compile on stable Rust 1.61 and up. It *might*
 //! compile with older versions but that may change in any new patch release.
 
 #![deny(missing_docs)]

cortex-m/src/peripheral/ac.rs

@@ -16,7 +16,7 @@ pub struct RegisterBlock {
     /// AHB Slave Control Register
     pub ahbscr: RW<u32>,
     reserved0: u32,
-    /// Auxilary Bus Fault Status Register
+    /// Auxiliary Bus Fault Status Register
     pub abfsr: RW<u32>,
 }
 

cortex-m/src/peripheral/scb.rs

@@ -344,7 +344,7 @@ impl SCB {
         let mut cbp = unsafe { CBP::new() };
 
         // Disable I-cache
-        // NOTE(unsafe): We have synchronised access by &mut self
+        // NOTE(unsafe): We have synchronized access by &mut self
         unsafe { self.ccr.modify(|r| r & !SCB_CCR_IC_MASK) };
 
         // Invalidate I-cache
@@ -417,7 +417,7 @@ impl SCB {
         }
 
         // Turn off the D-cache
-        // NOTE(unsafe): We have synchronised access by &mut self
+        // NOTE(unsafe): We have synchronized access by &mut self
         unsafe { self.ccr.modify(|r| r & !SCB_CCR_DC_MASK) };
 
         // Clean and invalidate whatever was left in it
@@ -646,10 +646,7 @@ impl SCB {
     /// a runtime-dependent `panic!()` call.
     #[inline]
     pub unsafe fn invalidate_dcache_by_slice<T>(&mut self, slice: &mut [T]) {
-        self.invalidate_dcache_by_address(
-            slice.as_ptr() as usize,
-            slice.len() * core::mem::size_of::<T>(),
-        );
+        self.invalidate_dcache_by_address(slice.as_ptr() as usize, core::mem::size_of_val(slice));
     }
 
     /// Cleans D-cache by address.
@@ -732,10 +729,7 @@ impl SCB {
     /// to main memory, overwriting whatever was in main memory.
     #[inline]
     pub fn clean_dcache_by_slice<T>(&mut self, slice: &[T]) {
-        self.clean_dcache_by_address(
-            slice.as_ptr() as usize,
-            slice.len() * core::mem::size_of::<T>(),
-        );
+        self.clean_dcache_by_address(slice.as_ptr() as usize, core::mem::size_of_val(slice));
     }
 
     /// Cleans and invalidates D-cache by address.

xtask/Cargo.toml

@@ -10,6 +10,6 @@ name = "ci"
 harness = false
 
 [dependencies]
-ar = "0.8.0"
+ar = "0.9.0"
 cortex-m = { path = "../cortex-m", features = ["serde", "std"] }
 serde_json = "1"

xtask/tests/ci.rs

@@ -27,9 +27,9 @@ static NON_BASE_TARGETS: &[&str] = &[
 fn build(package: &str, target: &str, features: &[&str]) {
     println!("building {} for {} {:?}", package, target, features);
     let mut cargo = Command::new("cargo");
-    cargo.args(&["build", "-p", package, "--target", target]);
+    cargo.args(["build", "-p", package, "--target", target]);
     for feat in features {
-        cargo.args(&["--features", *feat]);
+        cargo.args(["--features", *feat]);
     }
 
     // Cargo features don't work right when invoked from the workspace root, so change to the
@@ -73,7 +73,7 @@ fn check_crates_build(is_nightly: bool, is_msrv: bool) {
             let used_features = &*all_features
                 .iter()
                 .copied()
-                .filter(|feat| should_use_feature(*feat))
+                .filter(|feat| should_use_feature(feat))
                 .collect::<Vec<_>>();
 
             // (note: we don't test with default features disabled, since we don't use them yet)