rustfmt and refactor

examples/nrf-sdc/src/bin/ble_bas_peripheral.rs

@@ -8,16 +8,14 @@ use embassy_futures::join::join3;
 use embassy_nrf::{bind_interrupts, pac};
 use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 use embassy_time::{Duration, Timer};
-use nrf_sdc::{self as sdc, mpsl, mpsl::MultiprotocolServiceLayer};
+use nrf_sdc::mpsl::MultiprotocolServiceLayer;
+use nrf_sdc::{self as sdc, mpsl};
 use sdc::rng_pool::RngPool;
 use static_cell::StaticCell;
-use trouble_host::{
-    adapter::{Adapter, HostResources},
-    advertise::{AdStructure, Advertisement, BR_EDR_NOT_SUPPORTED, LE_GENERAL_DISCOVERABLE},
-    attribute::{AttributeTable, CharacteristicProp, Service, Uuid},
-    Address, PacketQos,
-};
-
+use trouble_host::adapter::{Adapter, HostResources};
+use trouble_host::advertise::{AdStructure, Advertisement, BR_EDR_NOT_SUPPORTED, LE_GENERAL_DISCOVERABLE};
+use trouble_host::attribute::{AttributeTable, CharacteristicProp, Service, Uuid};
+use trouble_host::{Address, PacketQos};
 use {defmt_rtt as _, panic_probe as _};
 
 bind_interrupts!(struct Irqs {

examples/nrf-sdc/src/bin/ble_l2cap_central.rs

@@ -8,17 +8,15 @@ use embassy_futures::join::join;
 use embassy_nrf::{bind_interrupts, pac};
 use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 use embassy_time::{Duration, Timer};
-use nrf_sdc::{self as sdc, mpsl, mpsl::MultiprotocolServiceLayer};
+use nrf_sdc::mpsl::MultiprotocolServiceLayer;
+use nrf_sdc::{self as sdc, mpsl};
 use sdc::rng_pool::RngPool;
 use static_cell::StaticCell;
-use trouble_host::{
-    adapter::{Adapter, HostResources},
-    connection::ConnectConfig,
-    l2cap::L2capChannel,
-    scan::ScanConfig,
-    Address, PacketQos,
-};
-
+use trouble_host::adapter::{Adapter, HostResources};
+use trouble_host::connection::ConnectConfig;
+use trouble_host::l2cap::L2capChannel;
+use trouble_host::scan::ScanConfig;
+use trouble_host::{Address, PacketQos};
 use {defmt_rtt as _, panic_probe as _};
 
 bind_interrupts!(struct Irqs {

examples/nrf-sdc/src/bin/ble_l2cap_peripheral.rs

@@ -8,16 +8,14 @@ use embassy_futures::join::join;
 use embassy_nrf::{bind_interrupts, pac};
 use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 use embassy_time::{Duration, Timer};
-use nrf_sdc::{self as sdc, mpsl, mpsl::MultiprotocolServiceLayer};
+use nrf_sdc::mpsl::MultiprotocolServiceLayer;
+use nrf_sdc::{self as sdc, mpsl};
 use sdc::rng_pool::RngPool;
 use static_cell::StaticCell;
-use trouble_host::{
-    adapter::{Adapter, HostResources},
-    advertise::{AdStructure, Advertisement, BR_EDR_NOT_SUPPORTED, LE_GENERAL_DISCOVERABLE},
-    l2cap::L2capChannel,
-    Address, PacketQos,
-};
-
+use trouble_host::adapter::{Adapter, HostResources};
+use trouble_host::advertise::{AdStructure, Advertisement, BR_EDR_NOT_SUPPORTED, LE_GENERAL_DISCOVERABLE};
+use trouble_host::l2cap::L2capChannel;
+use trouble_host::{Address, PacketQos};
 use {defmt_rtt as _, panic_probe as _};
 
 bind_interrupts!(struct Irqs {

examples/serial-hci/src/main.rs

@@ -6,14 +6,11 @@ use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 use log::*;
 use static_cell::StaticCell;
 use tokio::time::Duration;
-use tokio_serial::SerialStream;
-use tokio_serial::{DataBits, Parity, StopBits};
-use trouble_host::{
-    adapter::{Adapter, HostResources},
-    advertise::{AdStructure, Advertisement, BR_EDR_NOT_SUPPORTED, LE_GENERAL_DISCOVERABLE},
-    attribute::{AttributeTable, CharacteristicProp, Service, Uuid},
-    PacketQos,
-};
+use tokio_serial::{DataBits, Parity, SerialStream, StopBits};
+use trouble_host::adapter::{Adapter, HostResources};
+use trouble_host::advertise::{AdStructure, Advertisement, BR_EDR_NOT_SUPPORTED, LE_GENERAL_DISCOVERABLE};
+use trouble_host::attribute::{AttributeTable, CharacteristicProp, Service, Uuid};
+use trouble_host::PacketQos;
 
 #[tokio::main]
 async fn main() {

host/src/adapter.rs

@@ -1,15 +1,6 @@
-use crate::advertise::{Advertisement, AdvertisementConfig, RawAdvertisement};
-use crate::channel_manager::ChannelManager;
-use crate::connection::{ConnectConfig, Connection};
-use crate::connection_manager::{ConnectionInfo, ConnectionManager};
-use crate::cursor::{ReadCursor, WriteCursor};
-use crate::l2cap::{L2capHeader, PacketReassembly, L2CAP_CID_ATT, L2CAP_CID_DYN_START, L2CAP_CID_LE_U_SIGNAL};
-use crate::packet_pool::{AllocId, DynamicPacketPool, PacketPool, Qos};
-use crate::pdu::Pdu;
-use crate::scan::{PhySet, ScanConfig, ScanReport};
-use crate::types::l2cap::L2capLeSignal;
-use crate::Address;
-use crate::{AdapterError, Error};
+use core::future::pending;
+use core::task::Poll;
+
 use bt_hci::cmd::controller_baseband::{HostBufferSize, Reset, SetEventMask};
 use bt_hci::cmd::le::{
     LeAddDeviceToFilterAcceptList, LeClearAdvSets, LeClearFilterAcceptList, LeCreateConn, LeCreateConnCancel,
@@ -19,8 +10,7 @@ use bt_hci::cmd::le::{
 };
 use bt_hci::cmd::link_control::Disconnect;
 use bt_hci::cmd::{AsyncCmd, SyncCmd};
-use bt_hci::controller::{CmdError, Controller};
-use bt_hci::controller::{ControllerCmdAsync, ControllerCmdSync};
+use bt_hci::controller::{CmdError, Controller, ControllerCmdAsync, ControllerCmdSync};
 use bt_hci::data::{AclBroadcastFlag, AclPacket, AclPacketBoundary};
 use bt_hci::event::le::LeEvent;
 use bt_hci::event::{Event, Vendor};
@@ -29,16 +19,25 @@ use bt_hci::param::{
     InitiatingPhy, LeEventMask, Operation, PhyParams, ScanningPhy,
 };
 use bt_hci::ControllerToHostPacket;
-use core::future::pending;
-use core::task::Poll;
 use embassy_futures::select::{select, Either};
 use embassy_sync::blocking_mutex::raw::RawMutex;
 use embassy_sync::channel::Channel;
 use futures::pin_mut;
 use futures_intrusive::sync::LocalSemaphore;
 
+use crate::advertise::{Advertisement, AdvertisementConfig, RawAdvertisement};
+use crate::channel_manager::ChannelManager;
+use crate::connection::{ConnectConfig, Connection};
+use crate::connection_manager::{ConnectionInfo, ConnectionManager};
+use crate::cursor::{ReadCursor, WriteCursor};
+use crate::l2cap::sar::PacketReassembly;
+use crate::packet_pool::{AllocId, DynamicPacketPool, PacketPool, Qos};
+use crate::pdu::Pdu;
+use crate::scan::{PhySet, ScanConfig, ScanReport};
+use crate::types::l2cap::{L2capHeader, L2capLeSignal, L2CAP_CID_ATT, L2CAP_CID_DYN_START, L2CAP_CID_LE_U_SIGNAL};
 #[cfg(feature = "gatt")]
 use crate::{attribute::AttributeTable, gatt::GattServer};
+use crate::{AdapterError, Address, Error};
 
 pub struct HostResources<M: RawMutex, const CHANNELS: usize, const PACKETS: usize, const L2CAP_MTU: usize> {
     pool: PacketPool<M, L2CAP_MTU, PACKETS, CHANNELS>,

host/src/advertise.rs

@@ -1,13 +1,10 @@
-use crate::{
-    codec,
-    cursor::{ReadCursor, WriteCursor},
-    types::uuid::Uuid,
-    Address,
-};
+pub use bt_hci::param::{AdvChannelMap, AdvFilterPolicy, PhyKind};
 use bt_hci::param::{AdvEventProps, AdvHandle, AdvSet};
 use embassy_time::Duration;
 
-pub use bt_hci::param::{AdvChannelMap, AdvFilterPolicy, PhyKind};
+use crate::cursor::{ReadCursor, WriteCursor};
+use crate::types::uuid::Uuid;
+use crate::{codec, Address};
 
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[derive(Eq, PartialEq, Copy, Clone)]

host/src/attribute.rs

@@ -1,9 +1,13 @@
-use core::{cell::RefCell, fmt};
+use core::cell::RefCell;
+use core::fmt;
 
-use embassy_sync::blocking_mutex::{raw::RawMutex, Mutex};
+use embassy_sync::blocking_mutex::raw::RawMutex;
+use embassy_sync::blocking_mutex::Mutex;
 
+use crate::att::AttErrorCode;
+use crate::cursor::WriteCursor;
 pub use crate::types::uuid::Uuid;
-use crate::{att::AttErrorCode, cursor::WriteCursor, Error};
+use crate::Error;
 
 pub const GENERIC_ACCESS_SERVICE_UUID16: Uuid = Uuid::Uuid16(0x1800u16.to_le_bytes());
 pub const CHARACTERISTIC_DEVICE_NAME_UUID16: Uuid = Uuid::Uuid16(0x2A00u16.to_le_bytes());

host/src/attribute_server.rs

@@ -1,16 +1,15 @@
+use core::cell::RefCell;
+
 use bt_hci::param::ConnHandle;
 use embassy_sync::blocking_mutex::raw::RawMutex;
-
-use crate::{
-    att::{self, Att, AttDecodeError, AttErrorCode},
-    attribute::{AttributeData, AttributeTable},
-    codec,
-    cursor::WriteCursor,
-    types::uuid::Uuid,
-};
-use core::cell::RefCell;
 use embassy_sync::blocking_mutex::Mutex;
 
+use crate::att::{self, Att, AttDecodeError, AttErrorCode};
+use crate::attribute::{AttributeData, AttributeTable};
+use crate::codec;
+use crate::cursor::WriteCursor;
+use crate::types::uuid::Uuid;
+
 #[derive(Debug, PartialEq)]
 pub enum WorkResult {
     DidWork,

host/src/channel_manager.rs

@@ -1,27 +1,23 @@
-use core::{
-    cell::RefCell,
-    future::poll_fn,
-    task::{Context, Poll},
-};
-
-use bt_hci::{controller::Controller, param::ConnHandle};
-use embassy_sync::{
-    blocking_mutex::{raw::RawMutex, Mutex},
-    channel::Channel,
-    waitqueue::WakerRegistration,
-};
-
-use crate::{
-    adapter::HciController,
-    cursor::{ReadCursor, WriteCursor},
-    l2cap::L2capHeader,
-    packet_pool::{AllocId, DynamicPacketPool, Packet},
-    pdu::Pdu,
-    types::l2cap::{
-        L2capLeSignal, L2capLeSignalData, LeCreditConnReq, LeCreditConnRes, LeCreditConnResultCode, LeCreditFlowInd,
-    },
-    AdapterError, Error,
+use core::cell::RefCell;
+use core::future::poll_fn;
+use core::task::{Context, Poll};
+
+use bt_hci::controller::Controller;
+use bt_hci::param::ConnHandle;
+use embassy_sync::blocking_mutex::raw::RawMutex;
+use embassy_sync::blocking_mutex::Mutex;
+use embassy_sync::channel::Channel;
+use embassy_sync::waitqueue::WakerRegistration;
+
+use crate::adapter::HciController;
+use crate::cursor::{ReadCursor, WriteCursor};
+use crate::packet_pool::{AllocId, DynamicPacketPool, Packet};
+use crate::pdu::Pdu;
+use crate::types::l2cap::{
+    L2capHeader, L2capLeSignal, L2capLeSignalData, LeCreditConnReq, LeCreditConnRes, LeCreditConnResultCode,
+    LeCreditFlowInd,
 };
+use crate::{AdapterError, Error};
 
 const BASE_ID: u16 = 0x40;
 

host/src/connection.rs

@@ -1,16 +1,15 @@
-use bt_hci::{
-    cmd::{le::LeConnUpdate, link_control::Disconnect, status::ReadRssi},
-    controller::{Controller, ControllerCmdAsync, ControllerCmdSync},
-    param::{BdAddr, ConnHandle, DisconnectReason, LeConnRole},
-};
+use bt_hci::cmd::le::LeConnUpdate;
+use bt_hci::cmd::link_control::Disconnect;
+use bt_hci::cmd::status::ReadRssi;
+use bt_hci::controller::{Controller, ControllerCmdAsync, ControllerCmdSync};
+use bt_hci::param::{BdAddr, ConnHandle, DisconnectReason, LeConnRole};
 use embassy_sync::blocking_mutex::raw::RawMutex;
+use embassy_time::Duration;
 
 use crate::adapter::Adapter;
+pub use crate::connection_manager::ConnectionInfo;
 use crate::scan::ScanConfig;
 use crate::AdapterError;
-use embassy_time::Duration;
-
-pub use crate::connection_manager::ConnectionInfo;
 
 #[derive(Clone)]
 pub struct Connection {

host/src/connection_manager.rs

@@ -1,15 +1,12 @@
-use core::{
-    cell::RefCell,
-    future::poll_fn,
-    task::{Context, Poll},
-};
+use core::cell::RefCell;
+use core::future::poll_fn;
+use core::task::{Context, Poll};
 
 use bt_hci::param::{AddrKind, BdAddr, ConnHandle, LeConnRole, Status};
-use embassy_sync::{
-    blocking_mutex::{raw::RawMutex, Mutex},
-    signal::Signal,
-    waitqueue::WakerRegistration,
-};
+use embassy_sync::blocking_mutex::raw::RawMutex;
+use embassy_sync::blocking_mutex::Mutex;
+use embassy_sync::signal::Signal;
+use embassy_sync::waitqueue::WakerRegistration;
 
 use crate::Error;
 

host/src/gatt.rs

@@ -1,5 +1,10 @@
 use core::fmt;
 
+use bt_hci::controller::Controller;
+use bt_hci::param::ConnHandle;
+use embassy_sync::blocking_mutex::raw::RawMutex;
+use embassy_sync::channel::DynamicReceiver;
+
 use crate::adapter::HciController;
 use crate::att::{self, Att, ATT_HANDLE_VALUE_NTF_OPTCODE};
 use crate::attribute::CharacteristicHandle;
@@ -10,10 +15,6 @@ use crate::cursor::WriteCursor;
 use crate::packet_pool::{AllocId, DynamicPacketPool};
 use crate::pdu::Pdu;
 use crate::{AdapterError, Error};
-use bt_hci::controller::Controller;
-use bt_hci::param::ConnHandle;
-use embassy_sync::blocking_mutex::raw::RawMutex;
-use embassy_sync::channel::DynamicReceiver;
 
 pub struct GattServer<'reference, 'values, 'resources, M: RawMutex, T: Controller, const MAX: usize> {
     pub(crate) server: AttributeServer<'reference, 'values, M, MAX>,