diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index dcea25c5e..1426748cb 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -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 diff --git a/.github/workflows/rustdoc.yml b/.github/workflows/rustdoc.yml index cef117665..825ff742e 100644 --- a/.github/workflows/rustdoc.yml +++ b/.github/workflows/rustdoc.yml @@ -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 diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml index 3d9036e69..c3576a695 100644 --- a/.github/workflows/rustfmt.yml +++ b/.github/workflows/rustfmt.yml @@ -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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 19ff36502..f04d0f81e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: rust: - stable - 1.60.0 # MSRV - - nightly + - beta target: - x86_64-unknown-linux-gnu - thumbv7m-none-eabi @@ -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: @@ -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 }} diff --git a/embedded-hal-async/Cargo.toml b/embedded-hal-async/Cargo.toml index b10cfc734..b047b1b49 100644 --- a/embedded-hal-async/Cargo.toml +++ b/embedded-hal-async/Cargo.toml @@ -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"] diff --git a/embedded-hal-async/src/lib.rs b/embedded-hal-async/src/lib.rs index cc3060708..3ef259111 100644 --- a/embedded-hal-async/src/lib.rs +++ b/embedded-hal-async/src/lib.rs @@ -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; diff --git a/embedded-hal-bus/src/lib.rs b/embedded-hal-bus/src/lib.rs index 501534947..146ce0cfc 100644 --- a/embedded-hal-bus/src/lib.rs +++ b/embedded-hal-bus/src/lib.rs @@ -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")] diff --git a/embedded-io-adapters/src/lib.rs b/embedded-io-adapters/src/lib.rs index 533acc1a7..9d6628836 100644 --- a/embedded-io-adapters/src/lib.rs +++ b/embedded-io-adapters/src/lib.rs @@ -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")))] diff --git a/embedded-io-async/Cargo.toml b/embedded-io-async/Cargo.toml index fc704646b..acf7c1ff0 100644 --- a/embedded-io-async/Cargo.toml +++ b/embedded-io-async/Cargo.toml @@ -10,6 +10,7 @@ categories = [ "embedded", "no-std", ] +rust-version = "1.75.0" [features] std = ["alloc", "embedded-io/std"] diff --git a/embedded-io-async/src/lib.rs b/embedded-io-async/src/lib.rs index 2970aa82f..2dad78657 100644 --- a/embedded-io-async/src/lib.rs +++ b/embedded-io-async/src/lib.rs @@ -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;