[release/v1.7.0]: Revert "Rust module bindings and macros for defining procedures (#3444)"

This reverts commit dcd8640.

Author: bfops

crates/bindings-macro/src/lib.rs

@@ -8,7 +8,6 @@
 //
 // (private documentation for the macro authors is totally fine here and you SHOULD write that!)
 
-mod procedure;
 mod reducer;
 mod sats;
 mod table;
@@ -106,14 +105,6 @@ mod sym {
     }
 }
 
-#[proc_macro_attribute]
-pub fn procedure(args: StdTokenStream, item: StdTokenStream) -> StdTokenStream {
-    cvt_attr::<ItemFn>(args, item, quote!(), |args, original_function| {
-        let args = procedure::ProcedureArgs::parse(args)?;
-        procedure::procedure_impl(args, original_function)
-    })
-}
-
 #[proc_macro_attribute]
 pub fn reducer(args: StdTokenStream, item: StdTokenStream) -> StdTokenStream {
     cvt_attr::<ItemFn>(args, item, quote!(), |args, original_function| {

crates/bindings-macro/src/procedure.rs

@@ -4,7 +4,7 @@ use proc_macro2::{Span, TokenStream};
 use quote::{quote, quote_spanned};
 use syn::parse::Parser as _;
 use syn::spanned::Spanned;
-use syn::{FnArg, Ident, ItemFn, LitStr, PatType};
+use syn::{FnArg, Ident, ItemFn, LitStr};
 
 #[derive(Default)]
 pub(crate) struct ReducerArgs {
@@ -59,50 +59,33 @@ impl ReducerArgs {
     }
 }
 
-pub(crate) fn assert_only_lifetime_generics(original_function: &ItemFn, function_kind_plural: &str) -> syn::Result<()> {
+pub(crate) fn reducer_impl(args: ReducerArgs, original_function: &ItemFn) -> syn::Result<TokenStream> {
+    let func_name = &original_function.sig.ident;
+    let vis = &original_function.vis;
+
+    let reducer_name = args.name.unwrap_or_else(|| ident_to_litstr(func_name));
+
     for param in &original_function.sig.generics.params {
         let err = |msg| syn::Error::new_spanned(param, msg);
         match param {
             syn::GenericParam::Lifetime(_) => {}
-            syn::GenericParam::Type(_) => {
-                return Err(err(format!(
-                    "type parameters are not allowed on {function_kind_plural}"
-                )))
-            }
-            syn::GenericParam::Const(_) => {
-                return Err(err(format!(
-                    "const parameters are not allowed on {function_kind_plural}"
-                )))
-            }
+            syn::GenericParam::Type(_) => return Err(err("type parameters are not allowed on reducers")),
+            syn::GenericParam::Const(_) => return Err(err("const parameters are not allowed on reducers")),
         }
     }
-    Ok(())
-}
 
-/// Extract all function parameters, except for `self` ones that aren't allowed.
-pub(crate) fn extract_typed_args(original_function: &ItemFn) -> syn::Result<Vec<&PatType>> {
-    original_function
+    let lifecycle = args.lifecycle.iter().filter_map(|lc| lc.to_lifecycle_value());
+
+    // Extract all function parameters, except for `self` ones that aren't allowed.
+    let typed_args = original_function
         .sig
         .inputs
         .iter()
         .map(|arg| match arg {
             FnArg::Typed(arg) => Ok(arg),
             _ => Err(syn::Error::new_spanned(arg, "expected typed argument")),
         })
-        .collect()
-}
-
-pub(crate) fn reducer_impl(args: ReducerArgs, original_function: &ItemFn) -> syn::Result<TokenStream> {
-    let func_name = &original_function.sig.ident;
-    let vis = &original_function.vis;
-
-    let reducer_name = args.name.unwrap_or_else(|| ident_to_litstr(func_name));
-
-    assert_only_lifetime_generics(original_function, "reducers")?;
-
-    let lifecycle = args.lifecycle.iter().filter_map(|lc| lc.to_lifecycle_value());
-
-    let typed_args = extract_typed_args(original_function)?;
+        .collect::<syn::Result<Vec<_>>>()?;
 
     // Extract all function parameter names.
     let opt_arg_names = typed_args.iter().map(|arg| {
@@ -158,8 +141,6 @@ pub(crate) fn reducer_impl(args: ReducerArgs, original_function: &ItemFn) -> syn
         #[automatically_derived]
         impl spacetimedb::rt::FnInfo for #func_name {
             type Invoke = spacetimedb::rt::ReducerFn;
-            /// The function kind, which will cause scheduled tables to accept reducers.
-            type FnKind = spacetimedb::rt::FnKindReducer;
             const NAME: &'static str = #reducer_name;
             #(const LIFECYCLE: Option<spacetimedb::rt::LifecycleReducer> = Some(#lifecycle);)*
             const ARG_NAMES: &'static [Option<&'static str>] = &[#(#opt_arg_names),*];

crates/bindings-macro/src/reducer.rs

@@ -40,7 +40,7 @@ impl TableAccess {
 
 struct ScheduledArg {
     span: Span,
-    reducer_or_procedure: Path,
+    reducer: Path,
     at: Option<Ident>,
 }
 
@@ -113,7 +113,7 @@ impl TableArgs {
 impl ScheduledArg {
     fn parse_meta(meta: ParseNestedMeta) -> syn::Result<Self> {
         let span = meta.path.span();
-        let mut reducer_or_procedure = None;
+        let mut reducer = None;
         let mut at = None;
 
         meta.parse_nested_meta(|meta| {
@@ -126,26 +126,16 @@ impl ScheduledArg {
                     }
                 })
             } else {
-                check_duplicate_msg(
-                    &reducer_or_procedure,
-                    &meta,
-                    "can only specify one scheduled reducer or procedure",
-                )?;
-                reducer_or_procedure = Some(meta.path);
+                check_duplicate_msg(&reducer, &meta, "can only specify one scheduled reducer")?;
+                reducer = Some(meta.path);
             }
             Ok(())
         })?;
 
-        let reducer_or_procedure = reducer_or_procedure.ok_or_else(|| {
-            meta.error(
-                "must specify scheduled reducer or procedure associated with the table: scheduled(function_name)",
-            )
+        let reducer = reducer.ok_or_else(|| {
+            meta.error("must specify scheduled reducer associated with the table: scheduled(reducer_name)")
         })?;
-        Ok(Self {
-            span,
-            reducer_or_procedure,
-            at,
-        })
+        Ok(Self { span, reducer, at })
     }
 }
 
@@ -828,20 +818,17 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
                 )
             })?;
 
-            let reducer_or_procedure = &sched.reducer_or_procedure;
+            let reducer = &sched.reducer;
             let scheduled_at_id = scheduled_at_column.index;
             let desc = quote!(spacetimedb::table::ScheduleDesc {
-                reducer_or_procedure_name: <#reducer_or_procedure as spacetimedb::rt::FnInfo>::NAME,
+                reducer_name: <#reducer as spacetimedb::rt::FnInfo>::NAME,
                 scheduled_at_column: #scheduled_at_id,
             });
 
             let primary_key_ty = primary_key_column.ty;
             let scheduled_at_ty = scheduled_at_column.ty;
             let typecheck = quote! {
-                spacetimedb::rt::scheduled_typecheck::<
-                    #original_struct_ident,
-                    <#reducer_or_procedure as spacetimedb::rt::FnInfo>::FnKind,
-                >(#reducer_or_procedure);
+                spacetimedb::rt::scheduled_reducer_typecheck::<#original_struct_ident>(#reducer);
                 spacetimedb::rt::assert_scheduled_table_primary_key::<#primary_key_ty>();
                 let _ = |x: #scheduled_at_ty| { let _: spacetimedb::ScheduleAt = x; };
             };

crates/bindings-macro/src/table.rs

@@ -158,9 +158,6 @@ pub(crate) fn view_impl(_args: ViewArgs, original_function: &ItemFn) -> syn::Res
             /// The type of this function
             type Invoke = <spacetimedb::rt::ViewKind<#ctx_ty> as spacetimedb::rt::ViewKindTrait>::InvokeFn;
 
-            /// The function kind, which will cause scheduled tables to reject views.
-            type FnKind = spacetimedb::rt::FnKindView;
-
             /// The name of this function
             const NAME: &'static str = #view_name;
 

crates/bindings-macro/src/view.rs

@@ -1218,11 +1218,3 @@ impl Drop for RowIter {
         }
     }
 }
-
-pub mod procedure {
-    //! Side-effecting or asynchronous operations which only procedures are allowed to perform.
-    #[inline]
-    pub fn sleep_until(_wake_at_timestamp: i64) -> i64 {
-        todo!("Add `procedure_sleep_until` host function")
-    }
-}