WIP: update to latest dependencies

esp-rs · Jan 10, 2024 · efa5160 · efa5160
1 parent 20c6577
commit efa5160
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [?.??.?] - ????-??-??
+* MSRV 1.75; remove the nightly feature flag from all async trait implementations
+* Update public dependencies `embassy-time` to 0.5 and `heapless` to 0.8
 * #316 - BREAKING CHANGE addressing a typo - `http::server::Configuration::max_resp_handlers` renamed to `http::server::Configuration::max_resp_headers`
 * #319 - Set default TTL in `EspPing` to 64
 * #322 - Fix MQTT PSK code (did not compile)

diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 links = "esp_idf_svc"
 build = "build.rs"
 documentation = "https://esp-rs.github.io/esp-idf-svc/"
-rust-version = "1.71"
+rust-version = "1.75"
 
 [patch.crates-io]
 embedded-svc = { git = "https://github.com/esp-rs/embedded-svc" }
@@ -51,8 +51,8 @@ log = { version = "0.4", default-features = false }
 uncased = { version = "0.9.7", default-features = false }
 embedded-svc = { version = "0.26.4", default-features = false, features = ["asyncify"] }
 esp-idf-hal = { version = "0.42.5", default-features = false, features = ["esp-idf-sys"] }
-embassy-sync = { version = "0.3", optional = true }
-embassy-time = { version = "0.1.3", optional = true, features = ["tick-hz-1_000_000"] }
+embassy-sync = { version = "0.5", optional = true }
+embassy-time = { version = "0.2", optional = true, features = ["tick-hz-1_000_000"] }
 embassy-futures = "0.1"
 
 [build-dependencies]

diff --git a/src/eth.rs b/src/eth.rs
@@ -1266,7 +1266,7 @@ where
     }
 }
 
-#[cfg(all(feature = "nightly", feature = "alloc", esp_idf_comp_esp_timer_enabled))]
+#[cfg(all(feature = "alloc", esp_idf_comp_esp_timer_enabled))]
 impl<T> embedded_svc::eth::asynch::Eth for AsyncEth<T>
 where
     T: Eth<Error = EspError>,
@@ -1290,15 +1290,14 @@ where
     }
 }
 
-#[cfg(feature = "nightly")]
 #[cfg(esp_idf_comp_esp_netif_enabled)]
 impl<'d, T> crate::netif::asynch::NetifStatus for EspEth<'d, T> {
     async fn is_up(&self) -> Result<bool, EspError> {
         EspEth::is_up(self)
     }
 }
 
-#[cfg(all(feature = "nightly", feature = "alloc", esp_idf_comp_esp_timer_enabled))]
+#[cfg(all(feature = "alloc", esp_idf_comp_esp_timer_enabled))]
 #[cfg(esp_idf_comp_esp_netif_enabled)]
 impl<T> crate::netif::asynch::NetifStatus for AsyncEth<T>
 where

diff --git a/src/lib.rs b/src/lib.rs
@@ -11,12 +11,8 @@
 //! - `embassy-time-driver`
 //! - `embassy-time-isr-queue`
 #![cfg_attr(not(feature = "std"), no_std)]
-#![allow(stable_features)]
-#![allow(unknown_lints)]
+#![feature(async_fn_in_trait)]
 #![warn(clippy::large_futures)]
-#![cfg_attr(feature = "nightly", feature(async_fn_in_trait))]
-#![cfg_attr(feature = "nightly", allow(async_fn_in_trait))]
-#![cfg_attr(feature = "nightly", feature(impl_trait_projections))]
 
 #[cfg(feature = "alloc")]
 #[allow(unused_imports)]

diff --git a/src/netif.rs b/src/netif.rs
@@ -772,7 +772,6 @@ where
     }
 }
 
-#[cfg(feature = "nightly")]
 pub mod asynch {
     use crate::sys::EspError;
 

diff --git a/src/tls.rs b/src/tls.rs
@@ -733,7 +733,6 @@ mod esptls {
         }
     }
 
-    #[cfg(feature = "nightly")]
     #[cfg(all(
         not(esp_idf_version_major = "4"),
         any(not(esp_idf_version_major = "5"), not(esp_idf_version_minor = "0"))
@@ -745,7 +744,6 @@ mod esptls {
         type Error = EspIOError;
     }
 
-    #[cfg(feature = "nightly")]
     #[cfg(all(
         not(esp_idf_version_major = "4"),
         any(not(esp_idf_version_major = "5"), not(esp_idf_version_minor = "0"))
@@ -759,7 +757,6 @@ mod esptls {
         }
     }
 
-    #[cfg(feature = "nightly")]
     #[cfg(all(
         not(esp_idf_version_major = "4"),
         any(not(esp_idf_version_major = "5"), not(esp_idf_version_minor = "0"))

diff --git a/src/wifi.rs b/src/wifi.rs
@@ -2361,7 +2361,7 @@ where
     }
 }
 
-#[cfg(all(feature = "nightly", feature = "alloc", esp_idf_comp_esp_timer_enabled))]
+#[cfg(all(feature = "alloc", esp_idf_comp_esp_timer_enabled))]
 impl<T> embedded_svc::wifi::asynch::Wifi for AsyncWifi<T>
 where
     T: Wifi<Error = EspError> + NonBlocking,
@@ -2416,15 +2416,14 @@ where
     }
 }
 
-#[cfg(feature = "nightly")]
 #[cfg(esp_idf_comp_esp_netif_enabled)]
 impl<'d> crate::netif::asynch::NetifStatus for EspWifi<'d> {
     async fn is_up(&self) -> Result<bool, EspError> {
         EspWifi::is_up(self)
     }
 }
 
-#[cfg(all(feature = "nightly", feature = "alloc", esp_idf_comp_esp_timer_enabled))]
+#[cfg(all(feature = "alloc", esp_idf_comp_esp_timer_enabled))]
 #[cfg(esp_idf_comp_esp_netif_enabled)]
 impl<T> crate::netif::asynch::NetifStatus for AsyncWifi<T>
 where
-Original file line number
+Diff line change
@@ Expand Up / @@ -772,7 +772,6 @@ where @@
         }
     }
-    #[cfg(feature = "nightly")]
     pub mod asynch {
         use crate::sys::EspError;
@@ Expand Down @@