itsscb/esp-idf-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-idf-hal.git synced 2025-09-28 12:51:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CI - New Clippy Lints (#400)

Browse Source 
* remove redundant outer cfg attr

* more clippy

* cfg fix
This commit is contained in:
Frederick Vollbrecht 2024-04-02 13:16:10 +02:00 committed by GitHub
parent 603cef87cc
commit 7db642c37b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/task.rs
View File

@ -524,13 +524,6 @@ impl<'a> Drop for CriticalSectionGuard<'a> {
} }
} }
#[cfg(any(
all(
not(any(esp_idf_version_major = "4", esp_idf_version = "5.0")),
esp_idf_esp_task_wdt_en
),
any(esp_idf_version_major = "4", esp_idf_version = "5.0")
))]
pub mod watchdog { pub mod watchdog {
//! ## Example //! ## Example
//! //!

1
src/uart.rs
View File

@ -217,6 +217,7 @@ pub mod config {
#[cfg(esp_idf_soc_uart_support_xtal_clk)] #[cfg(esp_idf_soc_uart_support_xtal_clk)]
Crystal, Crystal,
/// UART source clock from `XTAL` /// UART source clock from `XTAL`
#[allow(non_camel_case_types)]
#[cfg(esp_idf_soc_uart_support_pll_f80m_clk)] #[cfg(esp_idf_soc_uart_support_pll_f80m_clk)]
PLL_F80M, PLL_F80M,
/// UART source clock from `REF_TICK` /// UART source clock from `REF_TICK`

72
src/ulp.rs
View File

@ -21,15 +21,13 @@ impl Default for SleepTimer {
esp_idf_ulp_coproc_enabled, esp_idf_ulp_coproc_enabled,
esp_idf_ulp_coproc_type_fsm esp_idf_ulp_coproc_type_fsm
), ),
all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled), all(esp32, esp_idf_esp32_ulp_coproc_enabled),
all( all(
esp_idf_version_major = "4",
esp32s2, esp32s2,
esp_idf_esp32s2_ulp_coproc_enabled, esp_idf_esp32s2_ulp_coproc_enabled,
not(esp_idf_esp32s2_ulp_coproc_riscv) not(esp_idf_esp32s2_ulp_coproc_riscv)
), ),
all( all(
esp_idf_version_major = "4",
esp32s3, esp32s3,
esp_idf_esp32s3_ulp_coproc_enabled, esp_idf_esp32s3_ulp_coproc_enabled,
not(esp_idf_esp32s3_ulp_coproc_riscv) not(esp_idf_esp32s3_ulp_coproc_riscv)
@ -47,15 +45,13 @@ pub struct Word {
esp_idf_ulp_coproc_enabled, esp_idf_ulp_coproc_enabled,
esp_idf_ulp_coproc_type_fsm esp_idf_ulp_coproc_type_fsm
), ),
all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled), all(esp32, esp_idf_esp32_ulp_coproc_enabled),
all( all(
esp_idf_version_major = "4",
esp32s2, esp32s2,
esp_idf_esp32s2_ulp_coproc_enabled, esp_idf_esp32s2_ulp_coproc_enabled,
not(esp_idf_esp32s2_ulp_coproc_riscv) not(esp_idf_esp32s2_ulp_coproc_riscv)
), ),
all( all(
esp_idf_version_major = "4",
esp32s3, esp32s3,
esp_idf_esp32s3_ulp_coproc_enabled, esp_idf_esp32s3_ulp_coproc_enabled,
not(esp_idf_esp32s3_ulp_coproc_riscv) not(esp_idf_esp32s3_ulp_coproc_riscv)
@ -77,49 +73,25 @@ impl Word {
#[cfg(any( #[cfg(any(
all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled), all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled),
all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled), all(esp32, esp_idf_esp32_ulp_coproc_enabled),
all( all(esp32s2, esp_idf_esp32s2_ulp_coproc_enabled),
esp_idf_version_major = "4", all(esp32s3, esp_idf_esp32s3_ulp_coproc_enabled)
esp32s2,
esp_idf_esp32s2_ulp_coproc_enabled
),
all(
esp_idf_version_major = "4",
esp32s3,
esp_idf_esp32s3_ulp_coproc_enabled
)
))] ))]
pub struct UlpDriver<'d>(crate::peripheral::PeripheralRef<'d, ULP>); pub struct UlpDriver<'d>(crate::peripheral::PeripheralRef<'d, ULP>);
#[cfg(any( #[cfg(any(
all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled), all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled),
all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled), all(esp32, esp_idf_esp32_ulp_coproc_enabled),
all( all(esp32s2, esp_idf_esp32s2_ulp_coproc_enabled),
esp_idf_version_major = "4", all(esp32s3, esp_idf_esp32s3_ulp_coproc_enabled)
esp32s2,
esp_idf_esp32s2_ulp_coproc_enabled
),
all(
esp_idf_version_major = "4",
esp32s3,
esp_idf_esp32s3_ulp_coproc_enabled
)
))] ))]
unsafe impl<'d> Send for UlpDriver<'d> {} unsafe impl<'d> Send for UlpDriver<'d> {}
#[cfg(any( #[cfg(any(
all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled), all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled),
all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled), all(esp32, esp_idf_esp32_ulp_coproc_enabled),
all( all(esp32s2, esp_idf_esp32s2_ulp_coproc_enabled),
esp_idf_version_major = "4", all(esp32s3, esp_idf_esp32s3_ulp_coproc_enabled)
esp32s2,
esp_idf_esp32s2_ulp_coproc_enabled
),
all(
esp_idf_version_major = "4",
esp32s3,
esp_idf_esp32s3_ulp_coproc_enabled
)
))] ))]
impl<'d> UlpDriver<'d> { impl<'d> UlpDriver<'d> {
pub fn new( pub fn new(
@ -196,15 +168,13 @@ impl<'d> UlpDriver<'d> {
esp_idf_ulp_coproc_enabled, esp_idf_ulp_coproc_enabled,
esp_idf_ulp_coproc_type_fsm esp_idf_ulp_coproc_type_fsm
), ),
all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled), all(esp32, esp_idf_esp32_ulp_coproc_enabled),
all( all(
esp_idf_version_major = "4",
esp32s2, esp32s2,
esp_idf_esp32s2_ulp_coproc_enabled, esp_idf_esp32s2_ulp_coproc_enabled,
not(esp_idf_esp32s2_ulp_coproc_riscv) not(esp_idf_esp32s2_ulp_coproc_riscv)
), ),
all( all(
esp_idf_version_major = "4",
esp32s3, esp32s3,
esp_idf_esp32s3_ulp_coproc_enabled, esp_idf_esp32s3_ulp_coproc_enabled,
not(esp_idf_esp32s3_ulp_coproc_riscv) not(esp_idf_esp32s3_ulp_coproc_riscv)
@ -305,17 +275,15 @@ impl<'d> UlpDriver<'d> {
not(esp_idf_ulp_coproc_type_fsm) not(esp_idf_ulp_coproc_type_fsm)
), ),
all( all(
esp_idf_version_major = "4",
esp32s2, esp32s2,
esp_idf_esp32s2_ulp_coproc_enabled, esp_idf_esp32s2_ulp_coproc_enabled,
esp_idf_esp32s2_ulp_coproc_riscv esp_idf_esp32s2_ulp_coproc_riscv
), ),
all( all(
esp_idf_version_major = "4",
esp32s3, esp32s3,
esp_idf_esp32s3_ulp_coproc_enabled, esp_idf_esp32s3_ulp_coproc_enabled,
esp_idf_esp32s3_ulp_coproc_riscv esp_idf_esp32s3_ulp_coproc_riscv
) ),
))] ))]
impl<'d> UlpDriver<'d> { impl<'d> UlpDriver<'d> {
pub unsafe fn load(&mut self, program: &[u8]) -> Result<(), esp_idf_sys::EspError> { pub unsafe fn load(&mut self, program: &[u8]) -> Result<(), esp_idf_sys::EspError> {
@ -364,17 +332,9 @@ crate::impl_peripheral!(ULP);
#[cfg(any( #[cfg(any(
all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled), all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled),
all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled), all(esp32, esp_idf_esp32_ulp_coproc_enabled),
all( all(esp32s2, esp_idf_esp32s2_ulp_coproc_enabled),
esp_idf_version_major = "4", all(esp32s3, esp_idf_esp32s3_ulp_coproc_enabled)
esp32s2,
esp_idf_esp32s2_ulp_coproc_enabled
),
all(
esp_idf_version_major = "4",
esp32s3,
esp_idf_esp32s3_ulp_coproc_enabled
)
))] ))]
impl ULP { impl ULP {
const RTC_SLOW_MEM: u32 = 0x5000_0000_u32; const RTC_SLOW_MEM: u32 = 0x5000_0000_u32;