diff --git a/src/eth.rs b/src/eth.rs index ba381dc..f085a51 100644 --- a/src/eth.rs +++ b/src/eth.rs @@ -68,7 +68,7 @@ where pub type EthMatterStack<'a, E> = MatterStack<'a, Eth>; /// A specialization of the `MatterStack` for Ethernet. -impl<'a, E> MatterStack<'a, Eth> +impl MatterStack<'_, Eth> where E: Embedding + 'static, { @@ -110,7 +110,7 @@ where /// - `persist` - a user-provided `Persist` implementation /// - `handler` - a user-provided DM handler implementation /// - `user` - a user-provided future that will be polled only when the netif interface is up - pub async fn run<'d, N, P, H, U>( + pub async fn run( &self, netif: N, persist: P, diff --git a/src/lib.rs b/src/lib.rs index afb2a38..07418bc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -319,7 +319,7 @@ where /// - `comm` - a tuple of additional and optional `NetworkReceive` and `NetworkSend` transport implementations /// (useful when a second transport needs to run in parallel with the operational Matter transport, /// i.e. when using concurrent commissisoning) - async fn run_oper_net<'d, I, U, R, S>( + async fn run_oper_net( &self, netif: I, until: U, @@ -444,7 +444,7 @@ where /// user-provided transport might not be IP-based (i.e. BLE). /// /// It also has no facilities for monitoring the transport network state. - async fn run_handlers<'d, P, H>(&self, persist: P, handler: H) -> Result<(), Error> + async fn run_handlers(&self, persist: P, handler: H) -> Result<(), Error> where H: AsyncHandler + AsyncMetadata, P: Persist, diff --git a/src/persist.rs b/src/persist.rs index ab9af4d..9d3c6af 100644 --- a/src/persist.rs +++ b/src/persist.rs @@ -230,7 +230,7 @@ where } } -impl<'a, T, C> Persist for KvPersist<'a, T, C> +impl Persist for KvPersist<'_, T, C> where T: KvBlobStore, C: NetworkPersist, diff --git a/src/wireless.rs b/src/wireless.rs index bde0341..222f644 100644 --- a/src/wireless.rs +++ b/src/wireless.rs @@ -183,7 +183,7 @@ pub type WifiNCMatterStack<'a, M, E> = MatterStack<'a, WirelessBle, /// Note that Alexa does not (yet) work with non-concurrent commissioning. pub type ThreadNCMatterStack<'a, M, E> = MatterStack<'a, WirelessBle, E>>; -impl<'a, M, T, E> MatterStack<'a, WirelessBle> +impl MatterStack<'_, WirelessBle> where M: RawMutex + Send + Sync + 'static, T: ConcurrentWirelessConfig, @@ -199,7 +199,7 @@ where /// - `persist` - a user-provided `Persist` implementation /// - `handler` - a user-provided DM handler implementation /// - `user` - a user-provided future that will be polled only when the netif interface is up - pub async fn run_with_controller<'d, C, N, B, P, H, U>( + pub async fn run_with_controller( &'static self, controller: C, netif: N, @@ -234,7 +234,7 @@ where } } -impl<'a, M, T, E> MatterStack<'a, WirelessBle> +impl MatterStack<'_, WirelessBle> where M: RawMutex + Send + Sync + 'static, T: WirelessConfig, @@ -260,7 +260,7 @@ where /// - `persist` - a user-provided `Persist` implementation /// - `handler` - a user-provided DM handler implementation /// - `user` - a user-provided future that will be polled only when the netif interface is up - pub async fn run<'d, W, B, P, H, U>( + pub async fn run( &'static self, wireless: W, ble: B, @@ -292,7 +292,7 @@ where .await } - async fn run_net<'d, W, B>(&'static self, mut wireless: W, mut ble: B) -> Result<(), Error> + async fn run_net(&'static self, mut wireless: W, mut ble: B) -> Result<(), Error> where W: Wireless, B: Ble, @@ -359,7 +359,7 @@ where } } - async fn run_net_with_controller<'d, C, N, B>( + async fn run_net_with_controller( &'static self, mut controller: C, netif: N, @@ -419,7 +419,7 @@ where } } - async fn run_comm_net<'d, N, B>( + async fn run_comm_net( &self, mut netif: N, btp: &Btp<&'static BtpContext, M, B>, @@ -443,7 +443,7 @@ where select(&mut btp_task, &mut net_task).coalesce().await } - async fn run_nc_comm_net<'d, B>( + async fn run_nc_comm_net( &'static self, btp: &Btp<&'static BtpContext, M, B>, ) -> Result<(), Error> @@ -609,7 +609,7 @@ mod bluez { } } - impl<'a> Ble for BuiltinBle<'a> { + impl Ble for BuiltinBle<'_> { type Peripheral<'t> = BuiltinGattPeripheral where diff --git a/src/wireless/comm.rs b/src/wireless/comm.rs index f55060b..d31a359 100644 --- a/src/wireless/comm.rs +++ b/src/wireless/comm.rs @@ -535,7 +535,7 @@ where } } -impl<'a, const N: usize, M, T> AsyncHandler for WirelessNwCommCluster<'a, N, M, T> +impl AsyncHandler for WirelessNwCommCluster<'_, N, M, T> where M: RawMutex, T: Controller,