Merge branch 'develop' into housekeeping and clippy and spellcheck

rust/src/hal/esp.rs

@@ -63,14 +63,14 @@ pub struct MqttClient<'a> {
     mqtt_client: EspMqttClient<'a>,
     base_topic: heapless::String<64>,
 }
-pub struct ESP<'a> {
+pub struct Esp<'a> {
     pub(crate) mqtt_client: Option<MqttClient<'a>>,
     pub(crate) wifi_driver: EspWifi<'a>,
     pub(crate) boot_button: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, esp_idf_hal::gpio::Input>,
     pub(crate) delay: Delay,
 }
 
-impl ESP<'_> {
+impl Esp<'_> {
     const SPIFFS_PARTITION_NAME: &'static str = "storage";
     const CONFIG_FILE: &'static str = "/spiffs/config.cfg";
     const BASE_PATH: &'static str = "/spiffs";
@@ -310,7 +310,7 @@ impl ESP<'_> {
                                 filename: file.file_name().into_string().unwrap(),
                                 size: file
                                     .metadata()
-                                    .and_then(|it| Ok(it.len()))
+                                    .map(|it| it.len())
                                     .unwrap_or_default()
                                     as usize,
                             };