From 865962dc86a3e65620c8501bf6b9ea23948b379c Mon Sep 17 00:00:00 2001 From: pv42 Date: Thu, 22 Aug 2024 22:15:38 +0200 Subject: [PATCH] feat: add signing, tokio-1 to clippy test feat: add signing to msrv check fix: test_tcp_connections import order revert: add default features on accident --- .github/workflows/test.yml | 4 ++-- mavlink-core/Cargo.toml | 3 +-- mavlink/tests/tcp_loopback_tests.rs | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 45d144f3c0..08992a9375 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: components: clippy - uses: actions-rs-plus/clippy-check@v2 with: - args: --all --all-targets --features format-generated-code + args: --all --all-targets --features format-generated-code --features signing --features tokio-1 internal-tests: runs-on: ubuntu-latest @@ -59,7 +59,7 @@ jobs: with: use-cross: true command: check - args: --all --all-targets + args: --all --all-targets --features signing build: needs: [formatting, linting, internal-tests, mavlink-dump, msrv] diff --git a/mavlink-core/Cargo.toml b/mavlink-core/Cargo.toml index df71bb2f83..d29acefc9e 100644 --- a/mavlink-core/Cargo.toml +++ b/mavlink-core/Cargo.toml @@ -42,5 +42,4 @@ sha2 = { version = "0.10", optional = true } "serde" = ["dep:serde", "dep:serde_arrays"] "tokio-1" = ["dep:tokio"] "signing" = ["dep:sha2"] -# DO NOT COMMIT -default = ["std", "tcp", "udp", "direct-serial", "serde", "tokio-1", "signing"] +default = ["std", "tcp", "udp", "direct-serial", "serde"] diff --git a/mavlink/tests/tcp_loopback_tests.rs b/mavlink/tests/tcp_loopback_tests.rs index e111545507..170189cb97 100644 --- a/mavlink/tests/tcp_loopback_tests.rs +++ b/mavlink/tests/tcp_loopback_tests.rs @@ -4,10 +4,10 @@ mod test_shared; mod test_tcp_connections { use std::thread; - #[cfg(feature = "signing")] - use mavlink::SigningConfig; #[cfg(feature = "signing")] use crate::test_shared; + #[cfg(feature = "signing")] + use mavlink::SigningConfig; /// Test whether we can send a message via TCP and receive it OK. This also test signing as a property of a MavConnection if the signing feature is enabled. #[test]