From 279f0f458d602d93bf7d7e173a17e7d26acfb975 Mon Sep 17 00:00:00 2001 From: ivmarkov Date: Sun, 21 May 2023 17:06:42 +0000 Subject: [PATCH] Make Clippy happy --- src/gpio.rs | 6 +++--- src/peripherals.rs | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gpio.rs b/src/gpio.rs index 690106d9d..86284359c 100644 --- a/src/gpio.rs +++ b/src/gpio.rs @@ -2103,7 +2103,7 @@ mod chip { } } -#[cfg(any(esp32c3))] +#[cfg(esp32c3)] #[cfg(not(feature = "riscv-ulp-hal"))] mod chip { use esp_idf_sys::*; @@ -2211,7 +2211,7 @@ mod chip { } } -#[cfg(any(esp32c2))] +#[cfg(esp32c2)] #[cfg(not(feature = "riscv-ulp-hal"))] mod chip { use esp_idf_sys::*; @@ -2316,7 +2316,7 @@ mod chip { } } -#[cfg(any(esp32h2))] +#[cfg(esp32h2)] #[cfg(not(feature = "riscv-ulp-hal"))] mod chip { use esp_idf_sys::*; diff --git a/src/peripherals.rs b/src/peripherals.rs index ebb0c7b0b..592ccb8f4 100644 --- a/src/peripherals.rs +++ b/src/peripherals.rs @@ -71,13 +71,13 @@ pub struct Peripherals { pub pcnt2: pcnt::PCNT2, #[cfg(all(not(feature = "riscv-ulp-hal"), any(esp32, esp32s2, esp32s3)))] pub pcnt3: pcnt::PCNT3, - #[cfg(all(not(feature = "riscv-ulp-hal"), any(esp32)))] + #[cfg(all(not(feature = "riscv-ulp-hal"), esp32))] pub pcnt4: pcnt::PCNT4, - #[cfg(all(not(feature = "riscv-ulp-hal"), any(esp32)))] + #[cfg(all(not(feature = "riscv-ulp-hal"), esp32))] pub pcnt5: pcnt::PCNT5, - #[cfg(all(not(feature = "riscv-ulp-hal"), any(esp32)))] + #[cfg(all(not(feature = "riscv-ulp-hal"), esp32))] pub pcnt6: pcnt::PCNT6, - #[cfg(all(not(feature = "riscv-ulp-hal"), any(esp32)))] + #[cfg(all(not(feature = "riscv-ulp-hal"), esp32))] pub pcnt7: pcnt::PCNT7, #[cfg(all(esp32, esp_idf_version_major = "4"))] pub hall_sensor: crate::hall::HallSensor, @@ -209,13 +209,13 @@ impl Peripherals { pcnt2: pcnt::PCNT2::new(), #[cfg(all(not(feature = "riscv-ulp-hal"), any(esp32, esp32s2, esp32s3)))] pcnt3: pcnt::PCNT3::new(), - #[cfg(all(not(feature = "riscv-ulp-hal"), any(esp32)))] + #[cfg(all(not(feature = "riscv-ulp-hal"), esp32))] pcnt4: pcnt::PCNT4::new(), - #[cfg(all(not(feature = "riscv-ulp-hal"), any(esp32)))] + #[cfg(all(not(feature = "riscv-ulp-hal"), esp32))] pcnt5: pcnt::PCNT5::new(), - #[cfg(all(not(feature = "riscv-ulp-hal"), any(esp32)))] + #[cfg(all(not(feature = "riscv-ulp-hal"), esp32))] pcnt6: pcnt::PCNT6::new(), - #[cfg(all(not(feature = "riscv-ulp-hal"), any(esp32)))] + #[cfg(all(not(feature = "riscv-ulp-hal"), esp32))] pcnt7: pcnt::PCNT7::new(), #[cfg(all(esp32, esp_idf_version_major = "4"))] hall_sensor: crate::hall::HallSensor::new(),