cargo fmt

Author: cujomalainey

ant/examples/mac_usb_hr_display.rs

@@ -6,16 +6,16 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use ant::channel::{RxError, RxHandler, TxError, TxHandler};
 use ant::drivers::{is_ant_usb_device_from_device, UsbDriver};
 use ant::messages::config::SetNetworkKey;
 use ant::plus::profiles::heart_rate::{Display, DisplayConfig, Period};
 use ant::router::Router;
-use ant::channel::{TxError, RxError, RxHandler, TxHandler};
 use dialoguer::Select;
 use rusb::{Device, DeviceList};
 
-use thingbuf::mpsc::{channel, Sender, Receiver};
-use thingbuf::mpsc::errors::{TrySendError, TryRecvError};
+use thingbuf::mpsc::errors::{TryRecvError, TrySendError};
+use thingbuf::mpsc::{channel, Receiver, Sender};
 
 struct TxSender<T> {
     sender: Sender<T>,
@@ -80,18 +80,32 @@ fn main() -> std::io::Result<()> {
     let (channel_tx, router_rx) = channel(8);
     let (router_tx, channel_rx) = channel(8);
 
-    let mut router = Router::new(driver, RxReceiver {receiver: router_rx}).unwrap();
+    let mut router = Router::new(
+        driver,
+        RxReceiver {
+            receiver: router_rx,
+        },
+    )
+    .unwrap();
     let snk = SetNetworkKey::new(0, [0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77]); // Get this from thisisant.com
     router.send(&snk).expect("failed to set network key");
-    let chan = router.add_channel(TxSender{ sender: router_tx} ).expect("Add channel failed");
+    let chan = router
+        .add_channel(TxSender { sender: router_tx })
+        .expect("Add channel failed");
     let config = DisplayConfig {
         device_number: 0,
         device_number_extension: 0.into(),
         channel: chan,
         period: Period::FourHz,
         ant_plus_key_index: 0,
     };
-    let mut hr = Display::new(config, TxSender {sender:channel_tx}, RxReceiver {receiver:channel_rx});
+    let mut hr = Display::new(
+        config,
+        TxSender { sender: channel_tx },
+        RxReceiver {
+            receiver: channel_rx,
+        },
+    );
     hr.set_rx_datapage_callback(Some(|x| println!("{:#?}", x)));
     hr.set_rx_message_callback(Some(|x| println!("{:#?}", x)));
     hr.open();

ant/src/plus/profiles/heart_rate/display.rs

@@ -7,6 +7,7 @@
 // except according to those terms.
 
 use crate::channel::duration_to_search_timeout;
+use crate::channel::{RxError, RxHandler, TxError, TxHandler};
 use crate::messages::config::{
     ChannelType, TransmissionChannelType, TransmissionGlobalDataPages, TransmissionType,
 };
@@ -20,7 +21,6 @@ use crate::plus::profiles::heart_rate::{
     DEVICE_TYPE,
 };
 use crate::plus::NETWORK_RF_FREQUENCY;
-use crate::channel::{RxError, RxHandler, TxError, TxHandler};
 
 use packed_struct::prelude::{packed_bits::Bits, Integer};
 use packed_struct::{PackedStruct, PrimitiveEnum};

ant/src/router.rs

@@ -6,12 +6,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use crate::channel::{RxError, RxHandler, TxError, TxHandler};
 use crate::drivers::{Driver, DriverError};
 use crate::messages::config::UnAssignChannel;
 use crate::messages::control::{CloseChannel, RequestMessage, RequestableMessageId, ResetSystem};
 use crate::messages::requested_response::Capabilities;
 use crate::messages::{AntMessage, RxMessage, TransmitableMessage, TxMessage};
-use crate::channel::{TxHandler, RxHandler, TxError, RxError};
 
 use std::cell::Cell;
 use std::marker::PhantomData;
@@ -95,11 +95,7 @@ impl<E, D: Driver<E>, T: TxHandler<AntMessage>, R: RxHandler<TxMessage>> Router<
     }
 
     /// Add channel at a specific index
-    pub fn add_channel_at_index(
-        &mut self,
-        channel: T,
-        index: usize,
-    ) -> Result<(), RouterError> {
+    pub fn add_channel_at_index(&mut self, channel: T, index: usize) -> Result<(), RouterError> {
         if index >= self.max_channels.get() {
             return Err(RouterError::ChannelOutOfBounds());
         }