Skip to content

Commit

Permalink
async require rust 1.75 (beta)
Browse files Browse the repository at this point in the history
  • Loading branch information
burrbull committed Nov 17, 2023
1 parent 6df95fd commit 4760e0d
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 42 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
# embedded-hal-async needs nightly.
# embedded-hal-async needs 1.75.
# Use a pinned version to avoid spontaneous breakages (new clippy lints are added often)
toolchain: nightly-2023-10-14
toolchain: beta
components: clippy
- run: cargo clippy --all-features -- --deny=warnings
2 changes: 1 addition & 1 deletion .github/workflows/rustdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ jobs:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2023-10-14
toolchain: beta
- run: RUSTDOCFLAGS="--deny=warnings --cfg=docsrs" cargo doc --all-features
2 changes: 1 addition & 1 deletion .github/workflows/rustfmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly
toolchain: beta
components: rustfmt
- run: cargo fmt --check
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
rust:
- stable
- 1.60.0 # MSRV
- nightly
- beta
target:
- x86_64-unknown-linux-gnu
- thumbv7m-none-eabi
Expand All @@ -31,7 +31,7 @@ jobs:
- rust: stable
target: x86_64-unknown-linux-gnu
features: alloc
- rust: nightly
- rust: beta
target: x86_64-unknown-linux-gnu
features: std,tokio-1,futures-03,defmt-03
steps:
Expand All @@ -42,7 +42,7 @@ jobs:
target: ${{ matrix.target }}

- run: mv Cargo.stable.toml Cargo.toml
if: matrix.rust != 'nightly'
if: matrix.rust != 'beta'

- run: cargo check --target=${{ matrix.target }} --features=${{ matrix.features }}

Expand Down
2 changes: 1 addition & 1 deletion embedded-hal-async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ name = "embedded-hal-async"
readme = "README.md"
repository = "https://github.com/rust-embedded/embedded-hal"
version = "1.0.0-rc.1"
rust-version = "1.65.0"
rust-version = "1.75.0"

[features]
defmt-03 = ["dep:defmt-03", "embedded-hal/defmt-03"]
Expand Down
8 changes: 0 additions & 8 deletions embedded-hal-async/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
#![doc = include_str!("../README.md")]
#![warn(missing_docs)]
#![no_std]
// disable warning for already-stabilized features.
// Needed to pass CI, because we deny warnings.
// We don't immediately remove them to not immediately break older nightlies.
// When all features are stable, we'll remove them.
#![allow(stable_features)]
#![allow(unknown_lints)]
#![allow(async_fn_in_trait)]
#![feature(async_fn_in_trait, impl_trait_projections)]

pub mod delay;
pub mod digital;
Expand Down
6 changes: 0 additions & 6 deletions embedded-hal-bus/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
#![warn(missing_docs)]
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(docsrs, feature(doc_cfg))]
// disable warning for already-stabilized features.
// Needed to pass CI, because we deny warnings.
// We don't immediately remove them to not immediately break older nightlies.
// When all features are stable, we'll remove them.
#![cfg_attr(feature = "async", allow(stable_features))]
#![cfg_attr(feature = "async", feature(async_fn_in_trait, impl_trait_projections))]

// needed to prevent defmt macros from breaking, since they emit code that does `defmt::blahblah`.
#[cfg(feature = "defmt-03")]
Expand Down
12 changes: 0 additions & 12 deletions embedded-io-adapters/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@
#![cfg_attr(docsrs, feature(doc_cfg))]
#![warn(missing_docs)]
#![doc = include_str!("../README.md")]
// disable warning for already-stabilized features.
// Needed to pass CI, because we deny warnings.
// We don't immediately remove them to not immediately break older nightlies.
// When all features are stable, we'll remove them.
#![cfg_attr(
any(feature = "tokio-1", feature = "futures-03"),
allow(stable_features)
)]
#![cfg_attr(
any(feature = "tokio-1", feature = "futures-03"),
feature(async_fn_in_trait, impl_trait_projections)
)]

#[cfg(feature = "std")]
#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
Expand Down
1 change: 1 addition & 0 deletions embedded-io-async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ categories = [
"embedded",
"no-std",
]
rust-version = "1.75.0"

[features]
std = ["alloc", "embedded-io/std"]
Expand Down
8 changes: 0 additions & 8 deletions embedded-io-async/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
#![cfg_attr(docsrs, feature(doc_cfg))]
#![warn(missing_docs)]
#![doc = include_str!("../README.md")]
// disable warning for already-stabilized features.
// Needed to pass CI, because we deny warnings.
// We don't immediately remove them to not immediately break older nightlies.
// When all features are stable, we'll remove them.
#![allow(stable_features)]
#![allow(unknown_lints)]
#![allow(async_fn_in_trait)]
#![feature(async_fn_in_trait, impl_trait_projections)]

#[cfg(feature = "alloc")]
extern crate alloc;
Expand Down

0 comments on commit 4760e0d

Please sign in to comment.