From 4362b752be443415a6f0767672232d7c74ed009e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Tue, 27 Jun 2023 20:28:12 +0200 Subject: [PATCH] Configure rustfmt to merge imports --- rustfmt.toml | 2 ++ signal-processing/src/heart_rate.rs | 3 +-- src/board/startup.rs | 9 +++++++-- src/states/mod.rs | 15 ++++++++------- 4 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 rustfmt.toml diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 00000000..07858358 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,2 @@ +unstable_features = true +imports_granularity = "Crate" \ No newline at end of file diff --git a/signal-processing/src/heart_rate.rs b/signal-processing/src/heart_rate.rs index 0aca5936..f5e95ee9 100644 --- a/signal-processing/src/heart_rate.rs +++ b/signal-processing/src/heart_rate.rs @@ -1,6 +1,5 @@ use crate::filter::{fir::Fir, median::MedianFilter, Filter}; -use qrs_detector::sampling::SamplingFrequency; -use qrs_detector::QrsDetector; +use qrs_detector::{sampling::SamplingFrequency, QrsDetector}; #[allow(clippy::excessive_precision)] const LP_COEFFS: [f32; 113] = [ diff --git a/src/board/startup.rs b/src/board/startup.rs index 3b6a4572..2e6ac44b 100644 --- a/src/board/startup.rs +++ b/src/board/startup.rs @@ -9,8 +9,13 @@ use crate::board::BatteryFg; use crate::board::{ drivers::frontend::Frontend, hal::{ - clock::Clocks, dma::DmaPriority, interrupt, peripherals, prelude::*, spi::dma::WithDmaSpi3, - spi::SpiMode, system::PeripheralClockControl, Spi, + clock::Clocks, + dma::DmaPriority, + interrupt, peripherals, + prelude::*, + spi::{dma::WithDmaSpi3, SpiMode}, + system::PeripheralClockControl, + Spi, }, utils::{DummyOutputPin, SpiDeviceWrapper}, wifi::driver::WifiDriver, diff --git a/src/states/mod.rs b/src/states/mod.rs index b14693bd..8032d5a3 100644 --- a/src/states/mod.rs +++ b/src/states/mod.rs @@ -14,15 +14,16 @@ pub use charging::charging; pub use error::app_error; pub use init::initialize; pub use measure::measure; -pub use menu::display::display_menu; -pub use menu::main::main_menu; +pub use menu::{display::display_menu, main::main_menu}; use object_chain::{Chain, ChainElement}; -use signal_processing::filter::pli::adaptation_blocking::AdaptationBlocking; -use signal_processing::filter::pli::PowerLineFilter; -use signal_processing::filter::{ - downsample::DownSampler, iir::precomputed::HIGH_PASS_CUTOFF_1_59HZ, +use signal_processing::{ + filter::{ + downsample::DownSampler, + iir::precomputed::HIGH_PASS_CUTOFF_1_59HZ, + pli::{adaptation_blocking::AdaptationBlocking, PowerLineFilter}, + }, + moving::sum::Sum, }; -use signal_processing::moving::sum::Sum; pub use wifi_ap::wifi_ap; use crate::states::measure::{EcgDownsampler, EcgFilter};