From e6eaae1cd7d92c8620c49a7a205a684381be43df Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Sat, 6 Jan 2024 21:35:12 +0100 Subject: [PATCH 1/4] feat: update to stable rust --- Cargo.toml | 5 +---- rust-toolchain | 2 +- src/lib.rs | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bb15f71..5446a1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,12 +10,9 @@ license = "MIT / Apache-2.0" keywords = ["embedded", "buffer", "embedded-io", "read", "write"] exclude = [".github"] -[features] -async = ["embedded-io-async"] - [dependencies] embedded-io = { version = "0.6" } -embedded-io-async = { version = "0.6", optional = true } +embedded-io-async = { version = "0.6" } [dev-dependencies] embedded-io-async = { version = "0.6", features = ["std"] } diff --git a/rust-toolchain b/rust-toolchain index 4cb3e45..07cde98 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2023-10-21 \ No newline at end of file +1.75 diff --git a/src/lib.rs b/src/lib.rs index 87dd886..e711e28 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,8 +1,3 @@ #![doc = include_str!("../README.md")] #![cfg_attr(not(test), no_std)] -#![feature(impl_trait_projections)] -#![feature(async_fn_in_trait)] -#![allow(stable_features, unknown_lints, async_fn_in_trait)] - -#[cfg(feature = "async")] pub mod asynch; From 3dee17f9495aaadf6518ce4a901b258e4288e13a Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Sat, 6 Jan 2024 21:36:09 +0100 Subject: [PATCH 2/4] fix: bump version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5446a1c..bdd0474 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "buffered-io" -version = "0.4.3" +version = "0.5.0" edition = "2021" description = "Bufferering types for embedded-io" readme = "README.md" From c283c21bbf410499f32dd64647c71d9bc07a942f Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Sat, 6 Jan 2024 21:40:23 +0100 Subject: [PATCH 3/4] no more features --- .github/workflows/ci.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ba6c596..f8c4a8e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,20 +16,15 @@ env: jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - features: - - --no-default-features - - --features async steps: - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2023-10-21 + toolchain: stable components: clippy - uses: actions/checkout@v3 - name: Build - run: cargo build ${{ matrix.features }} + run: cargo build - name: Clippy - run: cargo clippy ${{ matrix.features }} + run: cargo clippy - name: Run tests - run: cargo test ${{ matrix.features }} + run: cargo test From 22369839ebcac43eab62e476bcec7f0ca75a35f3 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Sat, 6 Jan 2024 21:42:21 +0100 Subject: [PATCH 4/4] use new format for rust-toolchain.toml --- rust-toolchain | 1 - rust-toolchain.toml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 07cde98..0000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.75 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..bdb08b3 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.75" +components = ["clippy"]