revert: switch style back to rust stable

GregoryConrad · Nov 30, 2023 · 4427dd0 · 4427dd0
1 parent 235be6b
commit 4427dd0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/rearch-macros/src/lib.rs b/rearch-macros/src/lib.rs
@@ -15,19 +15,18 @@ pub fn generate_tuple_side_effect_impl(input: TokenStream) -> TokenStream {
         .map(|ident| format_ident!("{ident}"))
         .collect::<Vec<_>>();
     let once_cell_inits = (0..types.len()).map(|_| quote! { OnceCell::new() });
-    let individual_apis =
-        (0..types.len()).map(syn::Index::from).map(|i| {
-            quote! {
-                self.#i.build(SideEffectRegistrar::new(&mut all_states.#i, {
-                    let rebuild_all = rebuild_all.clone();
-                    Box::new(move |mutation: Box<dyn FnOnce(&mut Box<dyn Any + Send>)>| {
-                        rebuild_all(Box::new(move |all_states| {
-                            mutation(all_states.#i.get_mut().expect(EFFECT_FAILED_CAST_MSG));
-                        }));
-                    })
-                }))
-            }
-        });
+    let individual_apis = (0..types.len()).map(syn::Index::from).map(|i| {
+        quote! {
+            self.#i.build(SideEffectRegistrar::new(&mut all_states.#i, {
+                let rebuild_all = rebuild_all.clone();
+                Box::new(move |mutation: Box<dyn FnOnce(&mut Box<dyn Any + Send>)>| {
+                    rebuild_all(Box::new(move |all_states| {
+                        mutation(all_states.#i.get_mut().expect(EFFECT_FAILED_CAST_MSG));
+                    }));
+                })
+            }))
+        }
+    });
     let effect_impl = quote! {
         impl<'a, #(#types: SideEffect<'a>),*> SideEffect<'a> for (#(#types),*) {
             type Api = (#(#types::Api),*);

diff --git a/rearch/src/side_effect_registrar.rs b/rearch/src/side_effect_registrar.rs
@@ -58,15 +58,14 @@ impl<'a> SideEffectRegistrar<'a> {
             .expect(PREVIOUS_INIT_FAILED_MSG)
             .downcast_mut::<T>()
             .unwrap_or_else(|| panic!("{}", EFFECT_FAILED_CAST_MSG));
-        let rebuild =
-            move |mutation: Box<dyn FnOnce(&mut T)>| {
-                (self.rebuilder)(Box::new(|data| {
-                    let data = data
-                        .downcast_mut::<T>()
-                        .unwrap_or_else(|| panic!("{}", EFFECT_FAILED_CAST_MSG));
-                    mutation(data);
-                }));
-            };
+        let rebuild = move |mutation: Box<dyn FnOnce(&mut T)>| {
+            (self.rebuilder)(Box::new(|data| {
+                let data = data
+                    .downcast_mut::<T>()
+                    .unwrap_or_else(|| panic!("{}", EFFECT_FAILED_CAST_MSG));
+                mutation(data);
+            }));
+        };
         (data, rebuild)
     }
 }

diff --git a/rearch/src/side_effects.rs b/rearch/src/side_effects.rs
@@ -183,11 +183,10 @@ where
     move |register: SideEffectRegistrar<'a>| {
         let (state, set_state) = register.register(lazy_state(read));
         let write = Arc::new(write);
-        let persist =
-            move |new_data| {
-                let persist_result = write(new_data);
-                set_state(persist_result);
-            };
+        let persist = move |new_data| {
+            let persist_result = write(new_data);
+            set_state(persist_result);
+        };
         (&*state, persist)
     }
 }