Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- 'async-tokio,gpio_cdev,gpio_sysfs,i2c,spi'

include:
- rust: 1.65.0 # MSRV
- rust: 1.84.0 # MSRV
target: x86_64-unknown-linux-gnu

# Test nightly but don't fail
Expand All @@ -37,9 +37,6 @@ jobs:
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}

- if: ${{ matrix.rust=='1.65.0' }}
run: cargo update --precise 2.0.106 --package syn

- name: Install armv7 libraries
if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.75.0
toolchain: 1.84.0
components: clippy
- run: cargo clippy --all-features -- --deny=warnings
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Changed

- MSRV is now 1.84.0.
- Set `resolver = "3"`, which implies `resolver.incompatible-rust-versions = "fallback"`

### Added

- Added async `DelayNs` implementation for `tokio`.
Expand Down
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ name = "linux-embedded-hal"
repository = "https://github.com/rust-embedded/linux-embedded-hal"
version = "0.5.0-alpha.0"
edition = "2018"
rust-version = "1.84"
resolver = "3"

[features]
gpio_sysfs = ["sysfs_gpio"]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ With `default-features = false` you can enable the features `gpio_cdev`, `gpio_s

## Minimum Supported Rust Version (MSRV)

This crate is guaranteed to compile on stable Rust 1.65.0 and up. It *might*
This crate is guaranteed to compile on stable Rust 1.84.0 and up. It *might*
compile with older versions but that may change in any new patch release.

## License
Expand Down
6 changes: 3 additions & 3 deletions src/timer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub trait Periodic {}
/// # Contract
///
/// - `self.start(count); block!(self.wait());` MUST block for AT LEAST the time specified by
/// `count`.
/// `count`.
///
/// *Note* that the implementer doesn't necessarily have to be a *downcounting* timer; it could also
/// be an *upcounting* timer as long as the above contract is upheld.
Expand Down Expand Up @@ -71,9 +71,9 @@ pub trait CountDown {
/// # Contract
///
/// - If `Self: Periodic`, the timer will start a new count down right after the last one
/// finishes.
/// finishes.
/// - Otherwise the behavior of calling `wait` after the last call returned `Ok` is UNSPECIFIED.
/// Implementers are suggested to panic on this scenario to signal a programmer error.
/// Implementers are suggested to panic on this scenario to signal a programmer error.
fn wait(&mut self) -> nb::Result<(), Self::Error>;
}

Expand Down