Fixes for Rust 1.61 (the MSRV)

Author: thejpster

cortex-m/src/psp.rs

@@ -14,13 +14,13 @@ pub struct StackHandle(*mut u32, usize);
 
 impl StackHandle {
     /// Get the pointer to the top of the stack
-    pub const fn top(&mut self) -> *mut u32 {
+    pub fn top(&mut self) -> *mut u32 {
         // SAFETY: The stack was this big when we constructed the handle
         unsafe { self.0.add(self.1) }
     }
 
     /// Get the pointer to the top of the stack
-    pub const fn bottom(&mut self) -> *mut u32 {
+    pub fn bottom(&mut self) -> *mut u32 {
         self.0
     }
 }

testsuite/src/main.rs

@@ -96,7 +96,7 @@ mod tests {
         let mut handle = super::STACK.take_handle();
         let top = handle.top();
         let bottom = handle.bottom();
-        let delta = unsafe { top.byte_offset_from(bottom) };
-        assert_eq!(delta as usize, super::STACK_SIZE_WORDS * 4);
+        let delta = unsafe { top.offset_from(bottom) };
+        assert_eq!(delta as usize, super::STACK_SIZE_WORDS);
     }
 }