From 0810cdb892f04a3ca364687cea7de34b1b5ce1a5 Mon Sep 17 00:00:00 2001 From: fromost Date: Wed, 26 Aug 2026 16:39:17 +0800 Subject: [PATCH] Optimize imports --- pn532/src/driver.rs | 2 +- pn532/src/felica/mod.rs | 6 +++--- pn532/src/iso14443a/mod.rs | 2 +- pn532/src/mifare/mod.rs | 2 +- pn532/src/tg/mod.rs | 2 +- src/board.rs | 17 ++++++++--------- src/components/card_reader.rs | 2 +- src/components/lora.rs | 6 +++--- src/components/rom_storage.rs | 4 ++-- src/error.rs | 5 ++--- src/main.rs | 2 +- src/types/mod.rs | 4 ++-- 12 files changed, 26 insertions(+), 28 deletions(-) diff --git a/pn532/src/driver.rs b/pn532/src/driver.rs index f9ec761..bd86c4a 100644 --- a/pn532/src/driver.rs +++ b/pn532/src/driver.rs @@ -1,7 +1,7 @@ //! High-level PN532 command driver. use crate::commands::*; -use crate::error::{Error}; +use crate::error::Error; use crate::interface::Interface; pub(crate) const PACKET_BUFFER_SIZE: usize = 64; diff --git a/pn532/src/felica/mod.rs b/pn532/src/felica/mod.rs index 712c101..5775c2c 100644 --- a/pn532/src/felica/mod.rs +++ b/pn532/src/felica/mod.rs @@ -4,11 +4,11 @@ use crate::driver::Pn532; use crate::error::{Error, StatusCode}; use crate::interface::Interface; -use types::*; -pub use types::Block as FelicaBlock; -pub(crate) use types::AsBlock; use crate::commands::{FELICA_CMD_POLLING, FELICA_CMD_READ_WITHOUT_ENCRYPTION, FELICA_CMD_REQUEST_RESPONSE, FELICA_CMD_REQUEST_SERVICE, FELICA_CMD_REQUEST_SYSTEM_CODE, FELICA_CMD_WRITE_WITHOUT_ENCRYPTION, FELICA_READ_MAX_BLOCK_NUM, FELICA_READ_MAX_SERVICE_NUM, FELICA_REQ_SERVICE_MAX_NODE_NUM, FELICA_WRITE_MAX_BLOCK_NUM, FELICA_WRITE_MAX_SERVICE_NUM, PN532_COMMAND_INDATAEXCHANGE, PN532_COMMAND_INLISTPASSIVETARGET, PN532_COMMAND_INRELEASE}; use crate::{BaudRate, FelicaPollingResponse}; +pub(crate) use types::AsBlock; +pub use types::Block as FelicaBlock; +use types::*; impl Pn532 { /// Poll for a FeliCa card. diff --git a/pn532/src/iso14443a/mod.rs b/pn532/src/iso14443a/mod.rs index 99a729b..97b40b9 100644 --- a/pn532/src/iso14443a/mod.rs +++ b/pn532/src/iso14443a/mod.rs @@ -1,6 +1,6 @@ -use crate::{BaudRate, Error, Interface, Pn532, Uid}; use crate::commands::{PN532_COMMAND_INDATAEXCHANGE, PN532_COMMAND_INLISTPASSIVETARGET, PN532_COMMAND_INRELEASE}; use crate::error::StatusCode; +use crate::{BaudRate, Error, Interface, Pn532, Uid}; impl Pn532 { /// Wait for an ISO14443A target and read its UID. diff --git a/pn532/src/mifare/mod.rs b/pn532/src/mifare/mod.rs index a141b34..3f6481b 100644 --- a/pn532/src/mifare/mod.rs +++ b/pn532/src/mifare/mod.rs @@ -1,6 +1,6 @@ -use crate::{Error, Interface, Pn532}; use crate::commands::{MIFARE_CMD_AUTH_A, MIFARE_CMD_AUTH_B, MIFARE_CMD_READ, MIFARE_CMD_WRITE, MIFARE_CMD_WRITE_ULTRALIGHT, PN532_COMMAND_INDATAEXCHANGE}; use crate::error::StatusCode; +use crate::{Error, Interface, Pn532}; impl Pn532 { /// Whether the block number is the first block of a sector. diff --git a/pn532/src/tg/mod.rs b/pn532/src/tg/mod.rs index f6112bf..1577bee 100644 --- a/pn532/src/tg/mod.rs +++ b/pn532/src/tg/mod.rs @@ -1,6 +1,6 @@ -use crate::{Error, Interface, Pn532, TargetInitStatus}; use crate::commands::{PN532_COMMAND_TGGETDATA, PN532_COMMAND_TGINITASTARGET, PN532_COMMAND_TGSETDATA}; use crate::error::StatusCode; +use crate::{Error, Interface, Pn532, TargetInitStatus}; impl Pn532 { /// Initialize the PN532 as a target using a raw command frame. diff --git a/src/board.rs b/src/board.rs index 85c6238..8a82f08 100644 --- a/src/board.rs +++ b/src/board.rs @@ -1,26 +1,25 @@ -use core::cell::RefCell; use crate::components::clock::Clock; use crate::components::lora::Lora; -use core::sync::atomic::{AtomicBool, AtomicPtr, Ordering}; -use crossbeam::atomic::AtomicCell; +use crate::components::{self, card_reader::CardReader, rom_storage::RomStorage}; +use crate::types::{AppData, LoraPubSub, SharedI2c}; +use core::cell::RefCell; +use core::sync::atomic::{AtomicBool, Ordering}; use embassy_embedded_hal::shared_bus::asynch::spi::SpiDevice; use embassy_executor::Spawner; use embassy_sync::blocking_mutex::raw::{CriticalSectionRawMutex, NoopRawMutex}; -use embassy_sync::mutex::Mutex; use embassy_sync::blocking_mutex::Mutex as BlockingMutex; +use embassy_sync::mutex::Mutex; use embassy_sync::pubsub::PubSubChannel; use embassy_time::{Duration, Timer}; use esp_hal::gpio::{InputConfig, Level, Pull}; -use esp_hal::i2c::master::{I2c}; +use esp_hal::i2c::master::I2c; +use esp_hal::interrupt::software::SoftwareInterruptControl; use esp_hal::peripherals::Peripherals; +use esp_hal::rng::{Trng, TrngSource}; use esp_hal::spi::master::{Config, Spi}; use esp_hal::timer::timg::TimerGroup; use esp_hal::{gpio, Async, Blocking}; -use esp_hal::interrupt::software::SoftwareInterruptControl; -use esp_hal::rng::{Trng, TrngSource}; use static_cell::StaticCell; -use crate::components::{ rom_storage::RomStorage, card_reader::CardReader, self }; -use crate::types::{AppData, LoraPayload, LoraPubSub, SharedI2c}; pub(crate) static LED_STATE: AtomicBool = AtomicBool::new(false); diff --git a/src/components/card_reader.rs b/src/components/card_reader.rs index 6d3761d..0bdb5ea 100644 --- a/src/components/card_reader.rs +++ b/src/components/card_reader.rs @@ -1,3 +1,4 @@ +use crate::types::{LoraPublisher, SharedI2c}; use core::sync::atomic::{AtomicPtr, Ordering}; use defmt::Debug2Format; use embassy_sync::once_lock::OnceLock; @@ -7,7 +8,6 @@ use esp_hal::rng::Trng; use lorawan_device::RngCore; use pn532::felica::FelicaBlock; use pn532::Pn532; -use crate::types::{LoraPublisher, SharedI2c}; static CARD_KEY: OnceLock> = OnceLock::new(); diff --git a/src/components/lora.rs b/src/components/lora.rs index 2a89b4b..185d6da 100644 --- a/src/components/lora.rs +++ b/src/components/lora.rs @@ -1,6 +1,6 @@ -use alloc::vec::Vec; -use crate::types::{LoraPayload, LoraPublisher, LoraSubscriber, SharedAsyncSpi}; use crate::timer::EmbassyTimer; +use crate::types::{LoraPayload, LoraPublisher, LoraSubscriber, SharedAsyncSpi}; +use alloc::vec::Vec; use chrono::{DateTime, NaiveDateTime, Utc}; use core::str::FromStr; use core::sync::atomic::{AtomicPtr, Ordering}; @@ -17,8 +17,8 @@ use lora_phy::lorawan_radio::LorawanRadio; use lora_phy::mod_params::RadioError; use lora_phy::sx126x::{Sx1262, Sx126x, TcxoCtrlVoltage}; use lora_phy::{sx126x, LoRa}; -use lorawan_device::async_device::Error as LoraDeviceError; use lorawan_device::async_device::Device; +use lorawan_device::async_device::Error as LoraDeviceError; use lorawan_device::default_crypto::DefaultFactory; use lorawan_device::{region, AppEui, AppKey, DevEui, JoinMode}; diff --git a/src/components/rom_storage.rs b/src/components/rom_storage.rs index f796cdf..f1eb784 100644 --- a/src/components/rom_storage.rs +++ b/src/components/rom_storage.rs @@ -1,11 +1,11 @@ +use crate::types::SharedI2c; use alloc::collections::BTreeMap; -use core::any::{TypeId}; +use core::any::TypeId; use eeprom24x::{Eeprom24x, SlaveAddr}; use embassy_embedded_hal::shared_bus::I2cDeviceError; use embassy_time::{Duration, Timer}; use serde::de::DeserializeOwned; use serde::Serialize; -use crate::types::SharedI2c; const ADDR_SIZE: usize = 256; diff --git a/src/error.rs b/src/error.rs index 5e75fb0..ffdd477 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,14 +1,13 @@ use crate::components::clock::ClockError; use crate::components::lora::LoraError; +use crate::components::rom_storage::StorageError; use core::convert::Infallible; -use defmt::{Formatter}; +use defmt::Formatter; use embassy_embedded_hal::shared_bus::I2cDeviceError; use embassy_executor::SpawnError; use esp_hal::i2c::master::ConfigError as I2cConfigError; -use esp_hal::i2c::master::Error as I2cError; use esp_hal::rng::TrngError; use esp_hal::spi::master::ConfigError as SpiConfigError; -use crate::components::rom_storage::StorageError; #[derive(Debug, thiserror::Error)] pub enum Error { diff --git a/src/main.rs b/src/main.rs index 9bc33c0..bf8ce48 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,7 +15,7 @@ mod components; mod types; #[allow(unused_imports)] -use {esp_backtrace as _, esp_println as _, esp_alloc as _}; +use {esp_alloc as _, esp_backtrace as _, esp_println as _}; use embassy_executor::Spawner; use embassy_time::{Duration, Timer}; diff --git a/src/types/mod.rs b/src/types/mod.rs index 99542e1..707b68b 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -1,8 +1,8 @@ use alloc::vec::Vec; +use chrono::{DateTime, Utc}; use core::fmt::{Display, Formatter}; -use chrono::{DateTime, NaiveDateTime, Utc}; -use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice; use embassy_embedded_hal::shared_bus::asynch::spi::SpiDevice; +use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice; use embassy_sync::blocking_mutex::raw::{CriticalSectionRawMutex, NoopRawMutex}; use embassy_sync::pubsub::{PubSubChannel, Publisher, Subscriber}; use esp_hal::i2c::master::I2c;