Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
ivmarkov committed Nov 28, 2024
1 parent ba27ed0 commit f083138
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,15 @@ rust-version = "1.78"
#rs-matter-stack = { path = "../rs-matter-stack" }

[patch.crates-io]
rs-matter = { git = "https://github.com/ivmarkov/rs-matter" }
rs-matter = { git = "https://github.com/project-chip/rs-matter" }
#rs-matter = { path = "../rs-matter/rs-matter" }
#edge-nal = { git = "https://github.com/ivmarkov/edge-net" }
#edge-nal = { path = "../edge-net/edge-nal" }
#edge-nal-std = { git = "https://github.com/ivmarkov/edge-net" }
#edge-nal-std = { path = "../edge-net/edge-nal-std" }
esp-idf-svc = { git = "https://github.com/esp-rs/esp-idf-svc" }
esp-idf-hal = { git = "https://github.com/esp-rs/esp-idf-hal" }
esp-idf-sys = { git = "https://github.com/esp-rs/esp-idf-sys" }

[profile.release]
opt-level = "s"
Expand Down
2 changes: 1 addition & 1 deletion src/ble.rs
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ where
}
}

impl<'a, 'd, M> GattPeripheral for EspBtpGattPeripheral<'a, 'd, M>
impl<M> GattPeripheral for EspBtpGattPeripheral<'_, '_, M>
where
M: BleEnabled,
{
Expand Down
9 changes: 6 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,16 @@ pub mod wireless;
///
/// User is expected to call this method early in the application's lifecycle
/// when there is plenty of task stack space available, as the initialization
/// consumes > 10KB of stack space, so it has to be done with care.
/// of `async-io` consumes > 10KB of stack space, so it has to be done with care.
///
/// Note that `async-io-mini` is much less demanding.
#[inline(never)]
#[cold]
#[cfg(feature = "std")]
pub fn init_async_io() -> Result<(), esp_idf_svc::sys::EspError> {
// We'll use `async-io` for networking, so ESP IDF VFS needs to be initialized
esp_idf_svc::io::vfs::initialize_eventfd(3)?;
// We'll use `async-io(-mini)` for networking, so ESP IDF VFS needs to be initialized
// esp_idf_svc::io::vfs::initialize_eventfd(3)?;
core::mem::forget(esp_idf_svc::io::vfs::MountedEventfs::mount(3));

esp_idf_svc::hal::task::block_on(init_async_io_async());

Expand Down
12 changes: 6 additions & 6 deletions src/wireless.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ where
}
}

impl<'a, 'd, T> Ble for EspMatterBle<'a, 'd, T>
impl<'a, T> Ble for EspMatterBle<'a, '_, T>
where
T: BluetoothModemPeripheral,
{
Expand Down Expand Up @@ -239,7 +239,7 @@ mod wifi {
EspSystemEventLoop,
);

impl<'a> WifiSvc for EspWifiSplit<'a> {
impl WifiSvc for EspWifiSplit<'_> {
type Error = EspError;

async fn get_capabilities(&self) -> Result<EnumSet<Capability>, Self::Error> {
Expand Down Expand Up @@ -320,7 +320,7 @@ mod wifi {
}
}

impl<'a> Netif for EspWifiSplit<'a> {
impl Netif for EspWifiSplit<'_> {
async fn get_conf(&self) -> Result<Option<NetifConf>, Error> {
let wifi = self.0.lock().await;

Expand All @@ -341,13 +341,13 @@ mod wifi {
}
}

impl<'a> NetifRun for EspWifiSplit<'a> {
impl NetifRun for EspWifiSplit<'_> {
async fn run(&self) -> Result<(), Error> {
core::future::pending().await
}
}

impl<'a> UdpBind for EspWifiSplit<'a> {
impl UdpBind for EspWifiSplit<'_> {
type Error = io::Error;
type Socket<'b>
= UdpSocket
Expand Down Expand Up @@ -392,7 +392,7 @@ mod wifi {
}
}

impl<'d, T> Wireless for EspMatterWifi<'d, T>
impl<T> Wireless for EspMatterWifi<'_, T>
where
T: WifiModemPeripheral,
{
Expand Down

0 comments on commit f083138

Please sign in to comment.