Merge #236 #305

236: Migrate to Rust 2021 as part of the public testing r=richardeoin a=hargoniX

Migration to Rust 2021 as part of the public testing.

We did actually catch one ICE bug with this \o/: rust-lang/rust#87426

305: remove release mode requirement from USB examples r=richardeoin a=newAM

This was fixed in usb-device: rust-embedded-community/usb-device#41

Co-authored-by: Henrik Böving <[email protected]>
Co-authored-by: Richard Meadows <[email protected]>
Co-authored-by: Alex Martens <[email protected]>

Author: 4 people

.github/bors.toml

@@ -2,14 +2,14 @@ block_labels = ["wip"]
 delete_merged_branches = true
 status = [
     "Rustfmt",
-    "ci (1.52.0, stm32h743)",
-    "ci (1.52.0, stm32h753)",
-    "ci (1.52.0, stm32h743v)",
-    "ci (1.52.0, stm32h753v)",
-    "ci (1.52.0, stm32h747cm7)",
-    "ci (1.52.0, stm32h7b3)",
-    "ci (1.52.0, stm32h7b0)",
-    "ci (1.52.0, stm32h735)",
+    "ci (1.56.1, stm32h743)",
+    "ci (1.56.1, stm32h753)",
+    "ci (1.56.1, stm32h743v)",
+    "ci (1.56.1, stm32h753v)",
+    "ci (1.56.1, stm32h747cm7)",
+    "ci (1.56.1, stm32h7b3)",
+    "ci (1.56.1, stm32h7b0)",
+    "ci (1.56.1, stm32h735)",
     "ci (stable, stm32h743)",
     "ci (stable, stm32h753)",
     "ci (stable, stm32h743v)",

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:                   # All permutations of {rust, mcu}
         rust:
-          - 1.52.0  # MSRV
+          - 1.56.1  # MSRV
           - stable
         mcu:
           - stm32h743

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+* MSRV increased to 1.56.1
+
 ## [v0.11.0] 2021-12-18
 
 * **Breaking**: Simplified API for reading device signature

Cargo.toml

@@ -10,7 +10,7 @@ authors = ["Andrew Straw <[email protected]>",
            "Matthew Meyer <[email protected]>",
            "Florian Jung <[email protected]>",
            "Matt Ickstadt <[email protected]>"]
-edition = "2018"
+edition = "2021"
 categories = ["embedded", "hardware-support", "no-std"]
 description = "Hardware Abstraction Layer implementation for STM32H7 series microcontrollers"
 keywords = ["arm", "cortex-m", "stm32h7xx", "hal", "embedded-hal"]

README.md

@@ -7,7 +7,7 @@ stm32h7xx-hal
 [![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/12691)
 [![CI](https://github.com/stm32-rs/stm32h7xx-hal/workflows/Continuous%20integration/badge.svg)](https://github.com/stm32-rs/stm32h7xx-hal/actions)
 [![Crates.io](https://img.shields.io/crates/v/stm32h7xx-hal.svg)](https://crates.io/crates/stm32h7xx-hal)
-![Minimum rustc version](https://img.shields.io/badge/rustc-1.52.0+-yellow.svg)
+![Minimum rustc version](https://img.shields.io/badge/rustc-1.56.1+-yellow.svg)
 
 [_stm32h7xx-hal_](https://github.com/stm32-rs/stm32h7xx-hal) contains
 a hardware abstraction layer on top of the peripheral access API for
@@ -111,7 +111,7 @@ programming interfaces are only available on the high density connectors.
 Minimum supported Rust version
 ------------------------------
 
-The Minimum Supported Rust Version (MSRV) at the moment is **1.52.0**. Older
+The Minimum Supported Rust Version (MSRV) at the moment is **1.56.1**. Older
 versions **may** compile, especially when some features are not used
 in your application.
 

examples/mdma_bursts.rs

@@ -112,15 +112,15 @@ fn main() -> ! {
         let mut cycles = 0;
         for _ in 0..10 {
             cycles += {
-                let start = DWT::get_cycle_count();
+                let start = DWT::cycle_count();
 
                 // Start block
                 transfer.start(|_| {});
 
                 // Wait for transfer to complete
                 while !transfer.get_transfer_complete_flag() {}
 
-                DWT::get_cycle_count() - start
+                DWT::cycle_count() - start
             };
         }
 

examples/sdmmc.rs

@@ -141,14 +141,14 @@ fn main() -> ! {
     let mut buffer = [0u8; 5120];
 
     cp.DWT.enable_cycle_counter();
-    let start = pac::DWT::get_cycle_count();
+    let start = pac::DWT::cycle_count();
 
     for i in 0..10 {
         // Read 10 blocks
         sdmmc.read_blocks(10 * i, &mut buffer).unwrap();
     }
 
-    let end = pac::DWT::get_cycle_count();
+    let end = pac::DWT::cycle_count();
     let duration = (end - start) as f32 / ccdr.clocks.c_ck().0 as f32;
 
     info!("Read 100 blocks at {} bytes/s", 5120. / duration);

examples/usb_passthrough.rs

@@ -1,8 +1,6 @@
 //! Dual CDC-ACM serial port example using polling in a busy loop.
 //!
 //! Characters written to one serial port appear on both.
-//!
-//! Note: This example must be built in release mode to work reliably
 #![no_std]
 #![no_main]
 

examples/usb_serial.rs

@@ -1,6 +1,4 @@
 //! CDC-ACM serial port example using polling in a busy loop
-//!
-//! Note: This example must be built in release mode to work reliably
 #![no_std]
 #![no_main]
 

src/time.rs

@@ -273,6 +273,6 @@ pub struct Instant {
 impl Instant {
     /// Ticks elapsed since the `Instant` was created
     pub fn elapsed(&self) -> u32 {
-        DWT::get_cycle_count().wrapping_sub(self.now)
+        DWT::cycle_count().wrapping_sub(self.now)
     }
 }