Improvements to the CI coverage; fixes where the coverage would throw warnings.

Author: finalyards

.gitignore

@@ -1,4 +1,7 @@
 **/target
 **/target_ci
 Cargo.lock
-.idea
+.idea
+
+# Created if running 'cargo test', locally
+/tests/

ci.sh

@@ -44,8 +44,19 @@ cargo batch \
     --- build --release --manifest-path examples/rp-pico-2-w/Cargo.toml --target thumbv8m.main-none-eabihf --features skip-cyw43-firmware
 #    --- build --release --manifest-path examples/apache-nimble/Cargo.toml --target thumbv7em-none-eabihf
 
-cargo fmt --check --manifest-path ./host/Cargo.toml
-cargo clippy --manifest-path ./host/Cargo.toml --features gatt,peripheral,central
+cargo +nightly fmt --check --manifest-path ./host/Cargo.toml
+cargo +nightly fmt --check --manifest-path ./host-macros/Cargo.toml
+
+cargo clippy --manifest-path ./host/Cargo.toml --features central,gatt,peripheral,scan,security
+cargo clippy --manifest-path ./host-macros/Cargo.toml
+
 cargo test --manifest-path ./host/Cargo.toml --lib -- --nocapture
-cargo test --manifest-path ./host/Cargo.toml --no-run -- --nocapture
-cargo test --manifest-path ./examples/tests/Cargo.toml --no-run -- --nocapture
+cargo test --manifest-path ./host/Cargo.toml --no-run
+#cargo test --manifest-path ./host/Cargo.toml --features central,gatt,peripheral,scan,security --lib -- --nocapture
+  # Fails with:
+  #   thread 'security_manager::pairing::peripheral::tests::just_works_with_irk_distribution' panicked at src/security_manager/pairing/peripheral.rs:911:13:
+  #   assertion failed: pairing_data.local_features.responder_key_distribution.identity_key()
+
+cargo test --manifest-path ./host/Cargo.toml --features central,gatt,peripheral,scan,security --no-run
+cargo test --manifest-path ./host-macros/Cargo.toml --lib -- --nocapture
+cargo test --manifest-path ./examples/tests/Cargo.toml --no-run

host-macros/src/lib.rs

@@ -110,6 +110,7 @@ pub fn gatt_service(args: TokenStream, item: TokenStream) -> TokenStream {
     // If there was an error parsing the characteristics, return the error
     if let Some(err) = err {
         let desc = err.to_string();
+        #[allow(clippy::uninlined_format_args)]
         ctxt.error_spanned_by(
             err.into_compile_error(),
             format!("Parsing characteristics was unsuccessful:\n{}", desc),
@@ -249,5 +250,6 @@ fn check_for_characteristic(
 #[proc_macro]
 pub fn uuid(args: TokenStream) -> TokenStream {
     let uuid = parse_macro_input!(args as uuid::UuidArgs);
+    #[allow(clippy::needless_return)]
     return uuid.uuid.into();
 }

host-macros/src/uuid.rs

@@ -7,7 +7,9 @@ use core::str::FromStr;
 use darling::{Error, FromMeta};
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use syn::{parse::Result, spanned::Spanned, Expr};
+use syn::parse::Result;
+use syn::spanned::Spanned;
+use syn::Expr;
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum Uuid {

host/src/scan.rs

@@ -128,7 +128,7 @@ impl<'d, C: Controller, P: PacketPool> Scanner<'d, C, P> {
             deadline: if config.timeout.as_ticks() == 0 {
                 None
             } else {
-                Some(Instant::now() + config.timeout.into())
+                Some(Instant::now() + config.timeout)
             },
             done: false,
         })

host/src/security_manager/mod.rs

@@ -567,6 +567,7 @@ impl<const BOND_COUNT: usize> SecurityManager<BOND_COUNT> {
         event: LeEventPacket,
         connections: &ConnectionManager<'_, P>,
     ) -> Result<(), Error> {
+        #[allow(clippy::single_match)]
         match event.kind {
             LeEventKind::LeLongTermKeyRequest => {
                 let event_data = LeLongTermKeyRequest::from_hci_bytes_complete(event.data)?;
@@ -583,6 +584,7 @@ impl<const BOND_COUNT: usize> SecurityManager<BOND_COUNT> {
         event: EventPacket,
         connections: &ConnectionManager<'_, P>,
     ) -> Result<(), Error> {
+        #[allow(clippy::single_match)]
         match event.kind {
             EventKind::EncryptionChangeV1 => {
                 let event_data = EncryptionChangeV1::from_hci_bytes_complete(event.data)?;