Update dependecies (#349)

Author: Sh3Rm4n

.github/workflows/msrv.yml

@@ -1,8 +1,6 @@
 name: MSRV
 
 on:
-  push:
-    branches: [master]
   pull_request:
   merge_group:
 
@@ -17,23 +15,20 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.59.0
+          toolchain: 1.60.0
           target: thumbv7em-none-eabihf
-      - run: cargo check --features=stm32f303xc,stm32-usbd,rt,can,ld --lib
+      - run: cargo check --features=stm32f303xc,usb,rt,can,ld --lib
 
   check-min-deps:
     name: Check Minimal Dependency Versions
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: stable
-          target: thumbv7em-none-eabihf
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: nightly
           target: thumbv7em-none-eabihf
       - run: cargo +nightly update -Z minimal-versions
-      - run: cargo check --features=stm32f303xc,stm32-usbd,rt,can,ld --lib --examples
+      - run: cargo tree
+      - run: cargo check --features=stm32f303xc,usb,rt,can,ld --lib --examples
 

CHANGELOG.md

@@ -18,7 +18,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Update `stm32f3` pac to v0.15.1 ([#335])
 - Update `bxcan` pac to v0.7.0 ([#335])
-- The MSRV was bumped to 1.59 ([#335])
 - Deprecate `Toggle` enum and use `Switch` instead for better naming purposes
   ([#334])
   - Add `impl From<Toggle> for Switch` to reduce churn.
@@ -28,6 +27,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Remove `Serial::split`, which possibly creates two mutable references two
   one Serial instance, which could've caused UB. The use case of this function
   was hard to find out anyway. ([#351])
+- Remove `defmt-*` features (`defmt` feature is still available), to finalize
+  migration from `defmt-0.2.x` -> `defmt-0.3.x`. ([#349])
+- Removed implicit `stm32-usbd` feature (use `usb` instead) ([#349])
 
 ### Added
 
@@ -48,6 +50,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   It is also not consistent with the rest of the crates API. ([#352])
 - Use [critical-section] crate instead of `interrupt_free`, which is not always
   sound. ([#350])
+  It is also not consistent with the rest of the crates API.
+- Use [critical-section] crate instead of `interrupt_free`, which is not always
+  sound.
+- The MSRV was bumped to 1.60 ([#349])
 
 [critical-section]: https://github.com/rust-embedded/critical-section
 
@@ -619,6 +625,7 @@ let clocks = rcc
 [#352]: https://github.com/stm32-rs/stm32f3xx-hal/pull/352
 [#351]: https://github.com/stm32-rs/stm32f3xx-hal/pull/351
 [#350]: https://github.com/stm32-rs/stm32f3xx-hal/pull/350
+[#349]: https://github.com/stm32-rs/stm32f3xx-hal/pull/349
 [#345]: https://github.com/stm32-rs/stm32f3xx-hal/pull/345
 [#346]: https://github.com/stm32-rs/stm32f3xx-hal/pull/346
 [#347]: https://github.com/stm32-rs/stm32f3xx-hal/pull/347

Cargo.toml

@@ -16,7 +16,7 @@ documentation = "https://docs.rs/stm32f3xx-hal"
 version = "0.9.2"
 exclude = ["codegen", ".markdownlint.yml"]
 resolver = "2"
-rust-version = "1.59"
+rust-version = "1.60"
 
 [package.metadata.docs.rs]
 features = ["stm32f303xc", "rt", "usb", "can", "enumset"]
@@ -29,49 +29,44 @@ members = [".", "testsuite", "codegen"]
 [dependencies]
 bxcan = { version = "0.7.0", optional = true }
 cfg-if = "1.0.0"
-cortex-m = "0.7.4"
+cortex-m = "0.7.7"
 cortex-m-rt = "0.7.3"
 critical-section = "1.1.2"
 defmt = { version = ">=0.2.3, <0.4.0", optional = true }
 embedded-dma = "0.2.0"
-embedded-hal = { version = "0.2.5", features = ["unproven"] }
-embedded-time = "0.12.0"
-enumset = { version = "1.0.6", optional = true }
-nb = "1.0.0"
+embedded-hal = { version = "0.2.7", features = ["unproven"] }
+embedded-time = "0.12.1"
+enumset = { version = "1.1.3", optional = true }
+nb = "1.1.0"
 num-traits = { version = "0.2.17", default-features = false}
-paste = "1.0.5"
+paste = "1.0.14"
 rtcc = { version = "0.3.0", optional = true }
 stm32-usbd = { version = "0.6.0", optional = true }
 stm32f3 = { version = "0.15.1", default-features = false }
 void = { version = "1.0.2", default-features = false }
 
 [dev-dependencies]
-cortex-m-rtic = "1.0"
+cortex-m-rtic = "1.1"
 cortex-m-semihosting = "0.5.0"
-defmt = "0.3.0"
+defmt = "0.3.5"
 defmt-rtt = "0.4.0"
-defmt-test = "0.3.0"
-panic-probe = "0.3.0"
-panic-rtt-target = { version = "0.1", features = ["cortex-m"] }
+defmt-test = "0.3.1"
+panic-probe = "0.3.1"
+panic-rtt-target = { version = "0.1.2", features = ["cortex-m"] }
 panic-semihosting = "0.6.0"
-rtt-target = { version = "0.3.1", features = ["cortex-m"] }
+rtt-target = { version = "0.4.0" }
 systick-monotonic = "1.0"
-usb-device = "0.2.8"
-usbd-serial = "0.1.1"
+usb-device = "0.3.1"
+usbd-serial = "0.2.0"
 
 [build-dependencies]
-slice-group-by = "0.3.0"
+slice-group-by = "0.3.1"
 
 [features]
-can = ["bxcan"]
+can = ["dep:bxcan"]
 default = ["rt", "ld", "usb", "can", "rtc", "enumset"]
-defmt-debug = ["defmt"]
+defmt = ["dep:defmt"]
 
-defmt-default = ["defmt"]
-defmt-error = ["defmt"]
-defmt-info = ["defmt"]
-defmt-trace = ["defmt"]
-defmt-warn = ["defmt"]
 device-selected = []
 direct-call-deprecated = []
 
@@ -90,7 +85,7 @@ mem-c = []
 mem-d = []
 mem-e = []
 rt = ["stm32f3/rt"]
-rtc = ["rtcc"]
+rtc = ["dep:rtcc"]
 
 # Any changes here should be mirrored in README.md, build.rs, src/lib.rs, and
 # .github/workflows/ci.yml.
@@ -135,7 +130,7 @@ svd-f302 = ["stm32f3/stm32f302"]
 svd-f303 = ["stm32f3/stm32f303"]
 svd-f373 = ["stm32f3/stm32f373"]
 svd-f3x4 = ["stm32f3/stm32f3x4"]
-usb = ["stm32-usbd"]
+usb = ["dep:stm32-usbd"]
 
 # cargo build/run
 [profile.dev]

README.md

@@ -4,7 +4,7 @@
 [![Crate](https://img.shields.io/crates/v/stm32f3xx-hal.svg)](https://crates.io/crates/stm32f3xx-hal)
 [![Docs](https://docs.rs/stm32f3xx-hal/badge.svg)](https://docs.rs/stm32f3xx-hal)
 [![Crates.io](https://img.shields.io/crates/d/stm32f3xx-hal.svg)](https://crates.io/crates/stm32f3xx-hal)
-![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.59+-blue.svg)
+![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.60+-blue.svg)
 
 `stm32f3xx-hal` contains a multi device hardware abstraction on top of the
 peripheral access API for the STMicro STM32F3 series microcontrollers. The
@@ -138,7 +138,7 @@ See the [examples folder](examples) for more example programs.
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.59.0 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.60.0 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 <!-- This should not prevent anyone to use newer features. -->

codegen/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 anyhow = "1"
 once_cell = "1"
 regex = "1"
-serde-xml-rs = "0.4"
+serde-xml-rs = "0.6"
 
 [dependencies.structopt]
 version = "0.3"

testsuite/Cargo.toml

@@ -55,15 +55,15 @@ harness = false
 cfg-if = "1.0"
 cortex-m = { version = "0.7.7", features = ["critical-section-single-core"] }
 cortex-m-rt = "0.7.3"
-defmt = "0.3.0"
+defmt = "0.3.5"
 defmt-rtt = "0.4.0"
-defmt-test = "0.3.0"
-enumset = { version = "1.0.6" }
+defmt-test = "0.3.1"
+enumset = { version = "1.1.3" }
 # TODO: Set stm32f303xc as default, but make it overwritable
 stm32f3xx-hal = { path = "..", features = ["defmt"]}
-panic-probe = { version = "0.3.0", features = ["print-defmt"] }
-nb = "1.0.0"
-num-traits = { version = "0.2.14", default-features = false }
+panic-probe = { version = "0.3.1", features = ["print-defmt"] }
+nb = "1.1.0"
+num-traits = { version = "0.2.17", default-features = false }
 
 [features]
 # enable all defmt logging levels