Make TryInsertError static

Author: coolreader18

crates/bindings-macro/src/lib.rs

@@ -958,15 +958,15 @@ fn table_impl(mut args: TableArgs, mut item: MutItem<syn::DeriveInput>) -> syn::
     let field_types = fields.iter().map(|f| f.ty).collect::<Vec<_>>();
 
     let tabletype_impl = quote! {
-        impl spacetimedb::Table for #tablehandle_ident<'_> {
+        impl spacetimedb::Table for #tablehandle_ident {
             type Row = #row_type;
 
             type UniqueConstraintViolation = #unique_err;
             type AutoIncOverflow = #autoinc_err;
 
             #integrate_generated_columns
         }
-        impl spacetimedb::table::TableInternal for #tablehandle_ident<'_> {
+        impl spacetimedb::table::TableInternal for #tablehandle_ident {
             const TABLE_NAME: &'static str = #table_name;
             // the default value if not specified is Private
             #(const TABLE_ACCESS: spacetimedb::table::TableAccess = #table_access;)*
@@ -985,7 +985,7 @@ fn table_impl(mut args: TableArgs, mut item: MutItem<syn::DeriveInput>) -> syn::
     let describe_table_func = quote! {
         #[export_name = #register_describer_symbol]
         extern "C" fn __register_describer() {
-            spacetimedb::rt::register_table::<#tablehandle_ident<'static>>()
+            spacetimedb::rt::register_table::<#tablehandle_ident>()
         }
     };
 
@@ -1027,22 +1027,21 @@ fn table_impl(mut args: TableArgs, mut item: MutItem<syn::DeriveInput>) -> syn::
     let trait_def = quote_spanned! {table_ident.span()=>
         #[allow(non_camel_case_types, dead_code)]
         #vis trait #table_ident {
-            fn #table_ident(&self) -> #row_type_to_table<'_>;
+            fn #table_ident(&self) -> &#row_type_to_table;
         }
         impl #table_ident for spacetimedb::Local {
-            fn #table_ident(&self) -> #row_type_to_table<'_> {
+            fn #table_ident(&self) -> &#row_type_to_table {
                 #[allow(non_camel_case_types)]
-                type #tablehandle_ident<'a> = #row_type_to_table<'a>;
-                #tablehandle_ident { _local: ::core::marker::PhantomData }
+                type #tablehandle_ident = #row_type_to_table;
+                &#tablehandle_ident {}
             }
         }
     };
 
     let tablehandle_def = quote! {
         #[allow(non_camel_case_types)]
-        #vis struct #tablehandle_ident<'a> {
-            _local: ::core::marker::PhantomData<&'a spacetimedb::Local>,
-        }
+        #[non_exhaustive]
+        #vis struct #tablehandle_ident {}
     };
 
     let emission = quote! {
@@ -1060,10 +1059,10 @@ fn table_impl(mut args: TableArgs, mut item: MutItem<syn::DeriveInput>) -> syn::
             #tablehandle_def
 
             impl spacetimedb::table::__MapRowTypeToTable for #row_type {
-                type Table<'a>  = #tablehandle_ident<'a>;
+                type Table = #tablehandle_ident;
             }
 
-            impl<'a> #tablehandle_ident<'a> {
+            impl #tablehandle_ident {
                 #(#unique_field_accessors)*
                 #(#index_accessors)*
             }

crates/bindings/src/table.rs

@@ -145,7 +145,7 @@ pub enum IndexAlgo<'a> {
 
 #[doc(hidden)]
 pub trait __MapRowTypeToTable {
-    type Table<'a>: Table;
+    type Table: Table;
 }
 
 /// A UNIQUE constraint violation on a table was attempted.

modules/rust-wasm-test/src/lib.rs

@@ -29,12 +29,12 @@ pub struct TestD {
 
 // uses internal apis that should not be used by user code
 #[allow(dead_code)] // false positive
-const fn get_table_access<T: spacetimedb::table::__MapRowTypeToTable>() -> TableAccess {
-    <T::Table<'static> as spacetimedb::table::TableInternal>::TABLE_ACCESS
+const fn get_table_access<Tbl: spacetimedb::Table>(_: impl Fn(&spacetimedb::Local) -> &Tbl + Copy) -> TableAccess {
+    <Tbl as spacetimedb::table::TableInternal>::TABLE_ACCESS
 }
 
 // This table was specified as public.
-const _: () = assert!(matches!(get_table_access::<TestD>(), TableAccess::Public));
+const _: () = assert!(matches!(get_table_access(test_d::test_d), TableAccess::Public));
 
 #[spacetimedb::table(name = test_e)]
 #[derive(Debug)]
@@ -55,7 +55,7 @@ pub enum TestF {
 }
 
 // // All tables are private by default.
-const _: () = assert!(matches!(get_table_access::<TestE>(), TableAccess::Private));
+const _: () = assert!(matches!(get_table_access(test_e::test_e), TableAccess::Private));
 
 #[spacetimedb::table(name = private)]
 pub struct Private {
@@ -69,7 +69,7 @@ pub struct Point {
 }
 
 // It is redundant, but we can explicitly specify a table as private.
-const _: () = assert!(matches!(get_table_access::<Point>(), TableAccess::Private));
+const _: () = assert!(matches!(get_table_access(points::points), TableAccess::Private));
 
 // Test we can compile multiple constraints
 #[spacetimedb::table(name = pk_multi_identity)]

smoketests/tests/auto_inc.py

@@ -72,7 +72,7 @@ def do_test_autoinc(self, int_ty):
 
 #[spacetimedb::reducer]
 pub fn add_new_$KEY_TY(ctx: &ReducerContext, name: String) -> Result<(), Box<dyn Error>> {
-    let value = ctx.db.person_$KEY_TY().insert(Person_$KEY_TY { key_col: 0, name });
+    let value = ctx.db.person_$KEY_TY().try_insert(Person_$KEY_TY { key_col: 0, name })?;
     println!("Assigned Value: {} -> {}", value.key_col, value.name);
     Ok(())
 }