Skip to content

Commit abbb2d7

Browse files
authored
Merge pull request #127 from jannic-dev-forks/msrv-1.84.0
Set MSRV to 1.84 and set resolver = 3
2 parents e822e4c + a899594 commit abbb2d7

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- 'async-tokio,gpio_cdev,gpio_sysfs,i2c,spi'
2323

2424
include:
25-
- rust: 1.65.0 # MSRV
25+
- rust: 1.84.0 # MSRV
2626
target: x86_64-unknown-linux-gnu
2727

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

40-
- if: ${{ matrix.rust=='1.65.0' }}
41-
run: cargo update --precise 2.0.106 --package syn
42-
4340
- name: Install armv7 libraries
4441
if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
4542
run: |

.github/workflows/clippy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: dtolnay/rust-toolchain@master
1515
with:
16-
toolchain: 1.75.0
16+
toolchain: 1.84.0
1717
components: clippy
1818
- run: cargo clippy --all-features -- --deny=warnings

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
### Changed
11+
12+
- MSRV is now 1.84.0.
13+
- Set `resolver = "3"`, which implies `resolver.incompatible-rust-versions = "fallback"`
14+
1015
### Added
1116

1217
- Added async `DelayNs` implementation for `tokio`.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ name = "linux-embedded-hal"
1111
repository = "https://github.com/rust-embedded/linux-embedded-hal"
1212
version = "0.5.0-alpha.0"
1313
edition = "2018"
14+
rust-version = "1.84"
15+
resolver = "3"
1416

1517
[features]
1618
gpio_sysfs = ["sysfs_gpio"]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![crates.io](https://img.shields.io/crates/d/linux-embedded-hal.svg)](https://crates.io/crates/linux-embedded-hal)
22
[![crates.io](https://img.shields.io/crates/v/linux-embedded-hal.svg)](https://crates.io/crates/linux-embedded-hal)
33
[![Documentation](https://docs.rs/linux-embedded-hal/badge.svg)](https://docs.rs/linux-embedded-hal)
4-
![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.65+-blue.svg)
4+
![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.84+-blue.svg)
55

66
# `linux-embedded-hal`
77

@@ -31,7 +31,7 @@ With `default-features = false` you can enable the features `gpio_cdev`, `gpio_s
3131

3232
## Minimum Supported Rust Version (MSRV)
3333

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

3737
## License

src/timer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub trait Periodic {}
1515
/// # Contract
1616
///
1717
/// - `self.start(count); block!(self.wait());` MUST block for AT LEAST the time specified by
18-
/// `count`.
18+
/// `count`.
1919
///
2020
/// *Note* that the implementer doesn't necessarily have to be a *downcounting* timer; it could also
2121
/// be an *upcounting* timer as long as the above contract is upheld.
@@ -71,9 +71,9 @@ pub trait CountDown {
7171
/// # Contract
7272
///
7373
/// - If `Self: Periodic`, the timer will start a new count down right after the last one
74-
/// finishes.
74+
/// finishes.
7575
/// - Otherwise the behavior of calling `wait` after the last call returned `Ok` is UNSPECIFIED.
76-
/// Implementers are suggested to panic on this scenario to signal a programmer error.
76+
/// Implementers are suggested to panic on this scenario to signal a programmer error.
7777
fn wait(&mut self) -> nb::Result<(), Self::Error>;
7878
}
7979

0 commit comments

Comments
 (0)