Relax callback bounds

crux_core/src/bridge/request_serde.rs

@@ -8,7 +8,7 @@ use crate::{
 // ANCHOR: resolve_serialized
 type ResolveOnceSerialized = Box<dyn FnOnce(&mut dyn erased_serde::Deserializer) + Send>;
 type ResolveManySerialized =
-    Box<dyn Fn(&mut dyn erased_serde::Deserializer) -> Result<(), ()> + Send>;
+    Box<dyn FnMut(&mut dyn erased_serde::Deserializer) -> Result<(), ()> + Send>;
 
 /// A deserializing version of Resolve
 ///
@@ -57,7 +57,7 @@ where
     /// which is used by the Bridge implementation.
     pub fn serialize<F, Eff>(self, effect: F) -> (Eff, ResolveSerialized)
     where
-        F: Fn(Op) -> Eff,
+        F: FnOnce(Op) -> Eff,
     {
         // FIXME should Eff be bound as `Serializable`?
         let (operation, resolve) = (self.operation, self.resolve);
@@ -73,9 +73,9 @@ where
 impl<Out> Resolve<Out> {
     /// Convert this Resolve into a version which deserializes from bytes, consuming it.
     /// The `func` argument is a 'deserializer' converting from bytes into the `Out` type.
-    fn deserializing<F>(self, func: F) -> ResolveSerialized
+    fn deserializing<F>(self, mut func: F) -> ResolveSerialized
     where
-        F: (Fn(&mut dyn erased_serde::Deserializer) -> Out) + Send + Sync + 'static,
+        F: (FnMut(&mut dyn erased_serde::Deserializer) -> Out) + Send + Sync + 'static,
         Out: 'static,
     {
         match self {

crux_core/src/capabilities/compose.rs

@@ -126,7 +126,7 @@ impl<Ev> Capability<Ev> for Compose<Ev> {
 
     fn map_event<F, NewEv>(&self, f: F) -> Self::MappedSelf<NewEv>
     where
-        F: Fn(NewEv) -> Ev + Send + Sync + Copy + 'static,
+        F: Fn(NewEv) -> Ev + Send + Sync + 'static,
         Ev: 'static,
         NewEv: 'static,
     {

crux_core/src/capabilities/render.rs

@@ -59,7 +59,7 @@ impl<Ev> Capability<Ev> for Render<Ev> {
 
     fn map_event<F, NewEv>(&self, f: F) -> Self::MappedSelf<NewEv>
     where
-        F: Fn(NewEv) -> Ev + Send + Sync + Copy + 'static,
+        F: Fn(NewEv) -> Ev + Send + Sync + 'static,
         Ev: 'static,
         NewEv: 'static,
     {

crux_core/src/capability/mod.rs

@@ -157,7 +157,7 @@
 //!     pub fn get_in_a_row<F>(&self, number_of_ducks: usize, event: F)
 //!     where
 //!         Event: 'static,
-//!         F: Fn(Vec<Duck>) -> Event + Send + 'static,
+//!         F: FnOnce(Vec<Duck>) -> Event + Send + 'static,
 //!     {
 //!         let ctx = self.context.clone();
 //!         // Start a shell interaction
@@ -274,7 +274,7 @@ impl Operation for Never {
 ///
 ///     fn map_event<F, NewEvent>(&self, f: F) -> Self::MappedSelf<NewEvent>
 ///     where
-///         F: Fn(NewEvent) -> Ev + Send + Sync + Copy + 'static,
+///         F: Fn(NewEvent) -> Ev + Send + Sync + 'static,
 ///         Ev: 'static,
 ///         NewEvent: 'static,
 ///     {
@@ -289,7 +289,7 @@ pub trait Capability<Ev> {
 
     fn map_event<F, NewEv>(&self, f: F) -> Self::MappedSelf<NewEv>
     where
-        F: Fn(NewEv) -> Ev + Send + Sync + Copy + 'static,
+        F: Fn(NewEv) -> Ev + Send + Sync + 'static,
         Ev: 'static,
         NewEv: 'static + Send;
 }
@@ -384,7 +384,7 @@ where
 ///
 /// pub fn get<F>(&self, callback: F)
 /// where
-///     F: Fn(TimeResponse) -> Ev + Send + Sync + 'static,
+///     F: FnOnce(TimeResponse) -> Ev + Send + Sync + 'static,
 /// {
 ///     let ctx = self.context.clone();
 ///     self.context.spawn(async move {

crux_core/tests/capability_orchestration.rs

@@ -93,7 +93,7 @@ pub mod capabilities {
 
             pub fn one<F>(&self, number: usize, event: F)
             where
-                F: Fn(usize) -> E + Send + 'static,
+                F: FnOnce(usize) -> E + Send + 'static,
                 E: 'static,
             {
                 let this = Clone::clone(self);
@@ -154,7 +154,7 @@ pub mod capabilities {
 
             pub fn two<F>(&self, number: usize, event: F)
             where
-                F: Fn(usize) -> E + Send + 'static,
+                F: FnOnce(usize) -> E + Send + 'static,
                 E: 'static,
             {
                 let this = Clone::clone(self);

crux_core/tests/capability_runtime.rs

@@ -60,7 +60,7 @@ mod capability {
 
         pub fn fetch_tree<F>(&self, id: usize, ev: F)
         where
-            F: Fn(Vec<usize>) -> Ev + Send + 'static,
+            F: FnOnce(Vec<usize>) -> Ev + Send + 'static,
         {
             let (results_tx, results_rx) = async_channel::unbounded::<usize>();
             let tasks_tx = self.tasks_tx.clone();

crux_http/src/middleware.rs

@@ -82,6 +82,7 @@ where
 
 /// The remainder of a middleware chain, including the endpoint.
 #[allow(missing_debug_implementations)]
+#[derive(Copy, Clone)]
 pub struct Next<'a> {
     next_middleware: &'a [Arc<dyn Middleware>],
     endpoint: &'a (dyn (Fn(Request, Client) -> BoxFuture<'static, Result<ResponseAsync>>)
@@ -90,14 +91,6 @@ pub struct Next<'a> {
              + 'static),
 }
 
-impl Clone for Next<'_> {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-
-impl Copy for Next<'_> {}
-
 impl<'a> Next<'a> {
     /// Create a new instance
     pub fn new(

crux_kv/src/lib.rs

@@ -78,7 +78,7 @@ where
     /// `KeyValueOutput::Get(KeyValueResult<Option<Vec<u8>>>)` as payload
     pub fn get<F>(&self, key: String, make_event: F)
     where
-        F: Fn(KeyValueResult) -> Ev + Send + Sync + 'static,
+        F: FnOnce(KeyValueResult) -> Ev + Send + Sync + 'static,
     {
         self.context.spawn({
             let context = self.context.clone();
@@ -114,7 +114,7 @@ where
     /// Will dispatch the event with a `KeyValueOutput::Set { result: KeyValueResult<()> }` as payload
     pub fn set<F>(&self, key: String, value: Vec<u8>, make_event: F)
     where
-        F: Fn(KeyValueResult) -> Ev + Send + Sync + 'static,
+        F: FnOnce(KeyValueResult) -> Ev + Send + Sync + 'static,
     {
         self.context.spawn({
             let context = self.context.clone();

crux_macros/src/capability.rs

@@ -38,7 +38,7 @@ impl ToTokens for CapabilityStructReceiver {
 
             fn map_event<F, NewEv>(&self, f: F) -> Self::MappedSelf<NewEv>
             where
-                F: Fn(NewEv) -> Ev + Send + Sync + Copy + 'static,
+                F: Fn(NewEv) -> Ev + Send + Sync + 'static,
                 Ev: 'static,
                 NewEv: 'static,
             {
@@ -115,7 +115,7 @@ mod tests {
             type MappedSelf<MappedEv> = Render<MappedEv>;
             fn map_event<F, NewEv>(&self, f: F) -> Self::MappedSelf<NewEv>
             where
-                F: Fn(NewEv) -> Ev + Send + Sync + Copy + 'static,
+                F: Fn(NewEv) -> Ev + Send + Sync + 'static,
                 Ev: 'static,
                 NewEv: 'static,
             {

crux_platform/src/lib.rs

@@ -30,7 +30,7 @@ where
 
     pub fn get<F>(&self, callback: F)
     where
-        F: Fn(PlatformResponse) -> Ev + Send + Sync + 'static,
+        F: FnOnce(PlatformResponse) -> Ev + Send + Sync + 'static,
     {
         self.context.spawn({
             let context = self.context.clone();

crux_time/src/lib.rs

@@ -65,7 +65,7 @@ where
     /// wrapped in the event produced by the `callback`.
     pub fn now<F>(&self, callback: F)
     where
-        F: Fn(TimeResponse) -> Ev + Send + Sync + 'static,
+        F: FnOnce(TimeResponse) -> Ev + Send + Sync + 'static,
     {
         self.context.spawn({
             let context = self.context.clone();
@@ -86,7 +86,7 @@ where
     /// Ask to receive a notification when the specified [`Instant`] has arrived.
     pub fn notify_at<F>(&self, instant: Instant, callback: F)
     where
-        F: Fn(TimeResponse) -> Ev + Send + Sync + 'static,
+        F: FnOnce(TimeResponse) -> Ev + Send + Sync + 'static,
     {
         self.context.spawn({
             let context = self.context.clone();
@@ -109,7 +109,7 @@ where
     /// Ask to receive a notification when the specified duration has elapsed.
     pub fn notify_after<F>(&self, duration: Duration, callback: F)
     where
-        F: Fn(TimeResponse) -> Ev + Send + Sync + 'static,
+        F: FnOnce(TimeResponse) -> Ev + Send + Sync + 'static,
     {
         self.context.spawn({
             let context = self.context.clone();

crux_time/tests/time_test.rs

@@ -106,12 +106,11 @@ mod shared {
 
     /// Helper to create an event with additional user info captured
     /// this is effectively partially applying the event constructor
-    pub fn event_with_user_info<E, F, U, T>(user_info: U, make_event: F) -> impl Fn(T) -> E
+    pub fn event_with_user_info<E, F, U, T>(user_info: U, make_event: F) -> impl FnOnce(T) -> E
     where
-        F: Fn(U, T) -> E,
-        U: Clone,
+        F: FnOnce(U, T) -> E,
     {
-        move |response| make_event(user_info.clone(), response)
+        move |response| make_event(user_info, response)
     }
 }
 

doctest_support/src/lib.rs

@@ -36,7 +36,7 @@ pub mod compose {
 
                 pub fn one<F>(&self, number: usize, event: F)
                 where
-                    F: Fn(usize) -> E + Send + 'static,
+                    F: FnOnce(usize) -> E + Send + 'static,
                     E: 'static,
                 {
                     let this = Clone::clone(self);
@@ -66,7 +66,7 @@ pub mod compose {
 
                 fn map_event<F, NewEv>(&self, f: F) -> Self::MappedSelf<NewEv>
                 where
-                    F: Fn(NewEv) -> Ev + Send + Sync + Copy + 'static,
+                    F: Fn(NewEv) -> Ev + Send + Sync + 'static,
                     Ev: 'static,
                     NewEv: 'static,
                 {
@@ -110,7 +110,7 @@ pub mod compose {
 
                 pub fn two<F>(&self, number: usize, event: F)
                 where
-                    F: Fn(usize) -> E + Send + 'static,
+                    F: FnOnce(usize) -> E + Send + 'static,
                     E: 'static,
                 {
                     let this = Clone::clone(self);
@@ -140,7 +140,7 @@ pub mod compose {
 
                 fn map_event<F, NewEv>(&self, f: F) -> Self::MappedSelf<NewEv>
                 where
-                    F: Fn(NewEv) -> Ev + Send + Sync + Copy + 'static,
+                    F: Fn(NewEv) -> Ev + Send + Sync + 'static,
                     Ev: 'static,
                     NewEv: 'static,
                 {

examples/notes/shared/src/capabilities/pub_sub.rs

@@ -32,7 +32,7 @@ where
 
     pub fn subscribe<F>(&self, make_event: F)
     where
-        F: Fn(Vec<u8>) -> Ev + Clone + Send + 'static,
+        F: FnOnce(Vec<u8>) -> Ev + Clone + Send + 'static,
     {
         self.context.spawn({
             let context = self.context.clone();

examples/notes/shared/src/capabilities/timer.rs

@@ -33,7 +33,7 @@ where
 
     pub fn start<F>(&self, id: u64, millis: usize, make_event: F)
     where
-        F: Fn(TimerOutput) -> Ev + Clone + Send + 'static,
+        F: FnOnce(TimerOutput) -> Ev + Clone + Send + 'static,
     {
         self.context.spawn({
             let context = self.context.clone();