diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4a6248d..d0a555c 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -12,10 +12,6 @@ jobs: quality: runs-on: ubuntu-latest name: cargo {fmt, clippy} - strategy: - fail-fast: false - matrix: - target: [thumbv6m-none-eabi] steps: - uses: actions/checkout@v4 with: @@ -25,13 +21,25 @@ jobs: with: toolchain: stable components: rustfmt,clippy - - name: rustup target add ${{ matrix.target }} - run: rustup target add ${{ matrix.target }} - name: cargo fmt run: cargo fmt --check - name: cargo clippy run: cargo clippy -- -F clippy::suspicious -F clippy::correctness -F clippy::perf -F clippy::style + test: + runs-on: ubuntu-latest + name: cargo test + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - name: Install stable + uses: dtolnay/rust-toolchain@master + with: + toolchain: stable + - name: cargo test + run: cargo test + check: runs-on: ubuntu-latest strategy: @@ -58,3 +66,24 @@ jobs: run: cargo +${{ matrix.version }} check --target ${{ matrix.target }} - name: cargo +${{ matrix.version }} build run: cargo +${{ matrix.version }} build --target ${{ matrix.target }} + + check-example-test-application: + runs-on: ubuntu-latest + name: check test_application example + defaults: + run: + working-directory: examples/test_application + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - name: Install stable + uses: dtolnay/rust-toolchain@master + with: + toolchain: stable + - name: cargo fmt + run: cargo fmt --check + - name: cargo clippy + run: cargo clippy -- -F clippy::suspicious -F clippy::correctness -F clippy::perf -F clippy::style + - name: cargo check + run: cargo check diff --git a/examples/test_application/Cargo.lock b/examples/test_application/Cargo.lock index 5767128..21f7d83 100644 --- a/examples/test_application/Cargo.lock +++ b/examples/test_application/Cargo.lock @@ -136,15 +136,6 @@ version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -159,22 +150,22 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitfields" -version = "0.13.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7151782e2cd1dd0a1b00951a8b1be6b242f9a2240df9d244e3a7dbf7b55e7ac0" +checksum = "dcdbce6688e3ab66aff2ab413b762ccde9f37990e27bba0bb38a4b2ad1b5d877" dependencies = [ "bitfields-impl", ] [[package]] name = "bitfields-impl" -version = "0.10.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6675c064f07fe6e2433bc55263e114db648288e539e7fda779abd3e0a2bfe93b" +checksum = "57413e4b276d883b77fb368b7b33ae6a5eb97692852d49a5394d4f72ba961827" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.108", "thiserror", ] @@ -223,9 +214,9 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "cobs" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" +checksum = "fea6d1b751c55bd9c0dda7d4ff752074e98f4765ae969664648bd193bb326d15" dependencies = [ "thiserror", ] @@ -292,14 +283,28 @@ dependencies = [ "embedded-io-async", "futures-sink", "futures-util", - "heapless 0.8.0", + "heapless", +] + +[[package]] +name = "embassy-sync" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b" +dependencies = [ + "cfg-if", + "critical-section", + "embedded-io-async", + "futures-core", + "futures-sink", + "heapless", ] [[package]] name = "embassy-time" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f820157f198ada183ad62e0a66f554c610cdcd1a9f27d4b316358103ced7a1f8" +checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65" dependencies = [ "cfg-if", "critical-section", @@ -308,14 +313,14 @@ dependencies = [ "embedded-hal 0.2.7", "embedded-hal 1.0.0", "embedded-hal-async", - "futures-util", + "futures-core", ] [[package]] name = "embassy-time-driver" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d45f5d833b6d98bd2aab0c2de70b18bfaa10faf661a1578fd8e5dfb15eb7eba" +checksum = "a0a244c7dc22c8d0289379c8d8830cae06bb93d8f990194d0de5efb3b5ae7ba6" dependencies = [ "document-features", ] @@ -486,15 +491,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - [[package]] name = "hash32" version = "0.3.1" @@ -504,27 +500,13 @@ dependencies = [ "byteorder", ] -[[package]] -name = "heapless" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" -dependencies = [ - "atomic-polyfill", - "hash32 0.2.1", - "rustc_version", - "serde", - "spin", - "stable_deref_trait", -] - [[package]] name = "heapless" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "hash32 0.3.1", + "hash32", "stable_deref_trait", ] @@ -594,16 +576,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" version = "0.4.27" @@ -691,7 +663,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" dependencies = [ "cobs 0.2.3", - "heapless 0.7.17", "postcard-derive", "serde", ] @@ -764,15 +735,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - [[package]] name = "rustix" version = "0.38.44" @@ -792,18 +754,6 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "semver" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" - [[package]] name = "serde" version = "1.0.219" @@ -821,7 +771,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.108", ] [[package]] @@ -833,15 +783,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -861,9 +802,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.101" +version = "2.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" dependencies = [ "proc-macro2", "quote", @@ -885,7 +826,7 @@ version = "0.1.0" dependencies = [ "async-std", "embassy-futures", - "embassy-sync", + "embassy-sync 0.6.2", "embedded-io-async", "log", "pretty_env_logger", @@ -909,7 +850,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.108", ] [[package]] @@ -917,10 +858,10 @@ name = "tinynet" version = "0.1.0" dependencies = [ "bitfields", - "cobs 0.3.0", + "cobs 0.4.0", "crc", "embassy-futures", - "embassy-sync", + "embassy-sync 0.7.2", "embassy-time", "embedded-io-async", "log", @@ -984,7 +925,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.108", "wasm-bindgen-shared", ] @@ -1019,7 +960,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.108", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/examples/test_application/src/main.rs b/examples/test_application/src/main.rs index b19eb87..475dfdd 100644 --- a/examples/test_application/src/main.rs +++ b/examples/test_application/src/main.rs @@ -6,7 +6,6 @@ use embassy_sync::{ blocking_mutex::raw::NoopRawMutex, pipe::{Pipe, Reader, Writer}, }; -use embedded_io_async::{Read, Write}; use tinynet::ptp_packets::{Master, PacketInterface, Slave}; const PIPE_LENGTH: usize = 256;