More expressive Ping trait

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Breaking change: OTA: GAT `Ota::Update` now parametric over lifetime and no longer returned by `&mut` ref
 * Breaking change: OTA: `OtaUpdate::abort` and `OtaUpdate::complete` now take `self` instead of `&mut self`
 * Breaking change: MQTT: GAT `Connection::Message` now parametric over lifetime
+* Breaking change: Ping: Callback function of `Ping::ping_details` can now be `FnMut` but does require `Send`
 * Breaking change: All pub structs in `utils::asyncify` that implement the `Future` trait are now private and wrapped with async methods
 * Breaking change: Removed structs `Blocking` and `TrivialAsync`, as well as all trait implementations on them, because their usefulness was questionable
 * Breaking change: Removed the deprecated module `httpd` and the dependency on `anyhow`

src/ping.rs

@@ -63,11 +63,11 @@ pub trait Ping {
 
     fn ping(&mut self, ip: ipv4::Ipv4Addr, conf: &Configuration) -> Result<Summary, Self::Error>;
 
-    fn ping_details<F: Fn(&Summary, &Reply)>(
+    fn ping_details<F: FnMut(&Summary, &Reply) + Send>(
         &mut self,
         ip: ipv4::Ipv4Addr,
         conf: &Configuration,
-        reply_callback: &F,
+        reply_callback: F,
     ) -> Result<Summary, Self::Error>;
 }
 
@@ -81,11 +81,11 @@ where
         (*self).ping(ip, conf)
     }
 
-    fn ping_details<F: Fn(&Summary, &Reply)>(
+    fn ping_details<F: FnMut(&Summary, &Reply) + Send>(
         &mut self,
         ip: ipv4::Ipv4Addr,
         conf: &Configuration,
-        reply_callback: &F,
+        reply_callback: F,
     ) -> Result<Summary, Self::Error> {
         (*self).ping_details(ip, conf, reply_callback)
     }
@@ -107,11 +107,11 @@ pub mod asynch {
             conf: &Configuration,
         ) -> Result<Summary, Self::Error>;
 
-        async fn ping_details<F: Fn(&Summary, &Reply)>(
+        async fn ping_details<F: FnMut(&Summary, &Reply) + Send>(
             &mut self,
             ip: ipv4::Ipv4Addr,
             conf: &Configuration,
-            reply_callback: &F,
+            reply_callback: F,
         ) -> Result<Summary, Self::Error>;
     }
 
@@ -129,11 +129,11 @@ pub mod asynch {
             (*self).ping(ip, conf).await
         }
 
-        async fn ping_details<F: Fn(&Summary, &Reply)>(
+        async fn ping_details<F: FnMut(&Summary, &Reply) + Send>(
             &mut self,
             ip: ipv4::Ipv4Addr,
             conf: &Configuration,
-            reply_callback: &F,
+            reply_callback: F,
         ) -> Result<Summary, Self::Error> {
             (*self).ping_details(ip, conf, reply_callback).await
         }