Merge pull request #58 from Jim-Hodapp-Coaching/clean_up_imports

Clean up imports

Author: calebbourg

esp32-wroom-rp/src/lib.rs

@@ -84,24 +84,23 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(test), no_std)]
 
-/// Fundamental interface for creating and send/receiving data to/from a TCP server.
-pub mod tcp_client;
-
 pub mod gpio;
-/// Fundamental interface for controlling a connected ESP32-WROOM NINA firmware-based Wifi board.
-pub mod wifi;
-
 /// Responsible for interactions over a WiFi network and also contains related types.
 pub mod network;
 /// Responsible for interactions with NINA firmware over a data bus.
 pub mod protocol;
+/// Fundamental interface for creating and send/receiving data to/from a TCP server.
+pub mod tcp_client;
+/// Fundamental interface for controlling a connected ESP32-WROOM NINA firmware-based Wifi board.
+pub mod wifi;
 
 mod spi;
 
+use defmt::{write, Format, Formatter};
+
 use network::NetworkError;
-use protocol::ProtocolError;
 
-use defmt::{write, Format, Formatter};
+use protocol::ProtocolError;
 
 const ARRAY_LENGTH_PLACEHOLDER: usize = 8;
 

esp32-wroom-rp/src/protocol.rs

@@ -1,17 +1,17 @@
 pub(crate) mod operation;
 
-use embedded_hal::blocking::delay::DelayMs;
+use core::cell::RefCell;
 
 use defmt::{write, Format, Formatter};
 
+use embedded_hal::blocking::delay::DelayMs;
+
 use heapless::{String, Vec};
 
 use super::network::{ConnectionState, IpAddress, Port, Socket, TransportMode};
 use super::wifi::ConnectionStatus;
 use super::{Error, FirmwareVersion, ARRAY_LENGTH_PLACEHOLDER};
 
-use core::cell::RefCell;
-
 pub(crate) const MAX_NINA_PARAM_LENGTH: usize = 4096;
 
 #[repr(u8)]

esp32-wroom-rp/src/protocol/operation.rs

@@ -1,6 +1,7 @@
-use crate::protocol::{NinaAbstractParam, NinaCommand};
-
 use heapless::Vec;
+
+use super::{NinaAbstractParam, NinaCommand};
+
 const MAX_NUMBER_OF_PARAMS: usize = 6;
 
 // Encapsulates all information needed to execute commands against Nina Firmware.

esp32-wroom-rp/src/spi.rs

@@ -1,23 +1,19 @@
 //! Serial Peripheral Interface (SPI) for Wifi
+use core::convert::Infallible;
 
-use crate::network::ConnectionState;
+use embedded_hal::blocking::delay::DelayMs;
+use embedded_hal::blocking::spi::Transfer;
 
 use super::gpio::EspControlInterface;
+use super::network::{ConnectionState, IpAddress, NetworkError, Port, Socket, TransportMode};
+use super::protocol::operation::Operation;
 use super::protocol::{
     NinaByteParam, NinaCommand, NinaConcreteParam, NinaLargeArrayParam, NinaParam,
-    NinaProtocolHandler, NinaSmallArrayParam, NinaWordParam, ProtocolInterface,
+    NinaProtocolHandler, NinaSmallArrayParam, NinaWordParam, ProtocolError, ProtocolInterface,
 };
-
-use super::network::{IpAddress, NetworkError, Port, Socket, TransportMode};
-use super::protocol::{operation::Operation, ProtocolError};
 use super::wifi::ConnectionStatus;
 use super::{Error, FirmwareVersion, ARRAY_LENGTH_PLACEHOLDER};
 
-use embedded_hal::blocking::delay::DelayMs;
-use embedded_hal::blocking::spi::Transfer;
-
-use core::convert::Infallible;
-
 // TODO: this should eventually move into NinaCommandHandler
 #[repr(u8)]
 #[derive(Debug)]

esp32-wroom-rp/src/tcp_client.rs

@@ -1,17 +1,16 @@
-use super::{Error, ARRAY_LENGTH_PLACEHOLDER};
-use crate::{network::NetworkError, wifi::Wifi};
-
-use super::protocol::NinaProtocolHandler;
-use crate::gpio::EspControlInterface;
-use crate::protocol::ProtocolInterface;
-
-use super::network::{ConnectionState, Hostname, IpAddress, Port, Socket, TransportMode};
-
 use embedded_hal::blocking::delay::DelayMs;
 use embedded_hal::blocking::spi::Transfer;
 
 use heapless::String;
 
+use super::gpio::EspControlInterface;
+use super::network::{
+    ConnectionState, Hostname, IpAddress, NetworkError, Port, Socket, TransportMode,
+};
+use super::protocol::{NinaProtocolHandler, ProtocolInterface};
+use super::wifi::Wifi;
+use super::{Error, ARRAY_LENGTH_PLACEHOLDER};
+
 const MAX_HOSTNAME_LENGTH: usize = 255;
 
 /// Connect trait that allows for a `TcpClient` instance to connect to a remote

esp32-wroom-rp/src/wifi.rs

@@ -1,16 +1,13 @@
-use embedded_hal::blocking::delay::DelayMs;
-use embedded_hal::blocking::spi::Transfer;
+use core::cell::RefCell;
 
 use defmt::{write, Format, Formatter};
 
-use super::{Error, FirmwareVersion};
+use embedded_hal::blocking::{delay::DelayMs, spi::Transfer};
 
 use super::gpio::EspControlInterface;
-use super::protocol::{NinaProtocolHandler, ProtocolInterface};
-
-use core::cell::RefCell;
-
 use super::network::IpAddress;
+use super::protocol::{NinaProtocolHandler, ProtocolInterface};
+use super::{Error, FirmwareVersion};
 
 /// An enumerated type that represents the current WiFi network connection status.
 #[repr(u8)]