From ce18a41520e61eafe165306c072a8e31234a3256 Mon Sep 17 00:00:00 2001 From: Jonathan 'theJPster' Pallant Date: Thu, 18 Dec 2025 20:58:37 +0000 Subject: [PATCH 1/2] Update MSRV to 1.87 Fixes heapless 0.9.2 build. --- .github/workflows/rust.yml | 2 +- CHANGELOG.md | 2 +- Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 129ffd3..4b2e6bb 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: # Always run MSRV too! - rust: ["stable", "1.86"] + rust: ["stable", "1.87"] features: ['log', 'defmt-log', '""'] steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c54303..b23385b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ The format is based on [Keep a Changelog] and this project adheres to [Semantic ### Changed - Updated to `defmt` 1.0.1, `embedded-hal-bus` 0.3.0, `env_logger` 0.11.8, `heapless` 0.9.1, and `hex-literal` 1.0.0. -- Raised the minimum supported Rust version to 1.86.0. +- Raised the minimum supported Rust version to 1.87.0. ## [Version 0.9.0] - 2025-06-08 diff --git a/Cargo.toml b/Cargo.toml index 6bb514b..6dbaee6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/rust-embedded-community/embedded-sdmmc-rs" version = "0.9.0" # Make sure to update the CI too! -rust-version = "1.86" +rust-version = "1.87" [dependencies] byteorder = {version = "1", default-features = false} From cba9a964dfe9892562b9826425582fae4f12ab18 Mon Sep 17 00:00:00 2001 From: Jonathan 'theJPster' Pallant Date: Thu, 18 Dec 2025 20:58:50 +0000 Subject: [PATCH 2/2] Removed core-error feature. MSRV now high enough that we don't need it --- CHANGELOG.md | 1 + Cargo.toml | 2 +- src/lib.rs | 3 --- src/sdcard/mod.rs | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b23385b..f69f5b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog] and this project adheres to [Semantic - Updated to `defmt` 1.0.1, `embedded-hal-bus` 0.3.0, `env_logger` 0.11.8, `heapless` 0.9.1, and `hex-literal` 1.0.0. - Raised the minimum supported Rust version to 1.87.0. +- Removed `core-error` feature as MSRV is now above 1.81 ## [Version 0.9.0] - 2025-06-08 diff --git a/Cargo.toml b/Cargo.toml index 6dbaee6..892c2fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,4 +33,4 @@ sha2 = "0.10" default = ["log"] defmt-log = ["dep:defmt"] log = ["dep:log"] -core-error = [] + diff --git a/src/lib.rs b/src/lib.rs index e8ebbab..65d76a6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -68,8 +68,6 @@ //! * `defmt-log`: By turning off the default features and enabling the //! `defmt-log` feature you can configure this crate to log messages over defmt //! instead. -//! * `core-error`: Enables implementations of `core::error::Error` for all error -//! types. This raises the Minimum Supported Rust Version to 1.81. //! //! You cannot enable both the `log` feature and the `defmt-log` feature. @@ -316,7 +314,6 @@ where } } -#[cfg(feature = "core-error")] impl core::error::Error for Error where E: core::fmt::Debug + core::fmt::Display {} /// A handle to a volume. diff --git a/src/sdcard/mod.rs b/src/sdcard/mod.rs index c27fa0e..05e2c58 100644 --- a/src/sdcard/mod.rs +++ b/src/sdcard/mod.rs @@ -648,7 +648,6 @@ impl core::fmt::Display for Error { } } -#[cfg(feature = "core-error")] impl core::error::Error for Error {} /// The different types of card we support.