Upgrade SpacetimeDB to v1.6.0 (#72)

tamaro-skaljic · web-flow · commit 4f174a7ab7fc · 2025-10-19T07:04:33.000+02:00
* Change SpacetimeDB to v1.6.0

* auto fix on clippy run

* run format + clippy
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Tamaro Skaljic<mail@tamaro-skaljic.de>"]
 name = "spacetimedsl"
-version = "0.10.0"
+version = "0.11.0"
 edition = "2024"
 description = "Ergonomic DSL for SpacetimeDB"
 documentation = "https://docs.rs/spacetimedsl"
@@ -14,10 +14,10 @@ readme = "README.md"
 
 [dependencies]
 # https://crates.io/crates/spacetimedb Easy support for interacting between SpacetimeDB and Rust.
-spacetimedb = "1.2.0"
+spacetimedb = "1.6.0"
 
 # https://crates.io/crates/spacetimedsl_derive Macros to extend SpacetimeDSL
-spacetimedsl_derive = { version = "0.10.0", path = "derive" }
+spacetimedsl_derive = { version = "0.11.0", path = "derive" }
 
 # https://crates.io/crates/itertools Extra iterator adaptors, iterator methods, free functions, and macros.
 itertools = "^0.14"
diff --git a/debug-helper/Cargo.toml b/debug-helper/Cargo.toml
@@ -13,4 +13,4 @@ syn = { default-features = false, features = [
     "extra-traits",
     "full",
     "parsing",
-], version = "2.0.103" } # https://crates.io/crates/syn
+], version = "2" } # https://crates.io/crates/syn
diff --git a/derive-input/Cargo.toml b/derive-input/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Tamaro Skaljic<mail@tamaro-skaljic.de>"]
 name = "spacetimedsl_derive-input"
-version = "0.10.0"
+version = "0.11.0"
 edition = "2024"
 description = "Contains structs which represent the input and output of SpacetimeDSL. Can be used by other proc-macro crates to build Macros which utilize SpacetimeDSL under the hood."
 documentation = "https://docs.rs/spacetimedsl_derive-input"
@@ -16,22 +16,22 @@ keywords = ["dsl", "spacetime", "macro", "codegen", "boilerplate"]
 ident_case = "1.0.1"
 
 # https://crates.io/crates/proc_macro2 A substitute implementation of the compiler's `proc_macro` API to decouple token-based libraries from the procedural macro use case.
-proc-macro2 = "1.0"
+proc-macro2 = "1"
 
 # https://crates.io/crates/syn Parser for Rust source code
-syn = { version = "2.0.103" }
+syn = { version = "2" }
 
 # https://crates.io/crates/quote Quasi-quoting macro quote!(...)
-quote = "1.0"
+quote = "1"
 
 # https://crates.io/crates/itertools Extra iterator adaptors, iterator methods, free functions, and macros.
-itertools = "^0.14"
+itertools = "0.14.0"
 
 # https://crates.io/crates/spacetimedb Easy support for interacting between SpacetimeDB and Rust.
-spacetimedb = "1.2.0"
+spacetimedb = "1.6.0"
 
 # https://crates.io/crates/spacetime-bindings-macro-input Unofficial Input Crate for the SpacetimeDB Macro Bindings.
-spacetime-bindings-macro-input = "1.1.1"
+spacetime-bindings-macro-input = "1.6.0"
 
 # https://crates.io/crates/strum Helpful macros for working with enums and strings
-strum = { version = "0.27", features = ["derive"] }
+strum = { version = "0.27.2", features = ["derive"] }
diff --git a/derive-input/src/internal/column.rs b/derive-input/src/internal/column.rs
@@ -14,6 +14,7 @@ use proc_macro2::Span;
 use spacetime_bindings_macro_input::table::ColumnArgs;
 use syn::{Ident, Path};
 
+#[allow(clippy::type_complexity)]
 pub(in crate::internal) fn try_parse(
     column_args: &ColumnArgs,
     rust_struct: &RustStruct,
diff --git a/derive-input/src/internal/dsl/table.rs b/derive-input/src/internal/dsl/table.rs
@@ -17,16 +17,17 @@ impl SpacetimeDSLTable {
     ) -> syn::Result<(SpacetimeDBTable, SpacetimeDSLTable)> {
         for unique_index_name in unique_indices {
             for multi_column_index in &mut spacetimedb_table.multi_column_indices {
-                if let IndexType::BTreeMultiColumn { columns: _ } = &multi_column_index.index_type {
-                    if multi_column_index.name.eq(&unique_index_name) {
-                        multi_column_index.is_unique = true;
-                    }
+                if let IndexType::BTreeMultiColumn { columns: _ } = &multi_column_index.index_type
+                    && multi_column_index.name.eq(&unique_index_name)
+                {
+                    multi_column_index.is_unique = true;
                 }
             }
         }
 
         match column_args
             .primary_key_column
+            .as_ref()
             .expect("The table should have a `#[primary_key]` column!")
             .vis
         {
diff --git a/derive-input/src/internal/integration.rs b/derive-input/src/internal/integration.rs
@@ -16,16 +16,15 @@ fn get_all_table_attributes<'a>(
     // Find all table attributes
     let mut table_attrs = Vec::new();
     for attr in &input.attrs {
-        if let Ok(list) = attr.meta.require_list() {
-            if list.path.to_token_stream().to_string().eq("table")
+        if let Ok(list) = attr.meta.require_list()
+            && (list.path.to_token_stream().to_string().eq("table")
                 || list
                     .path
                     .to_token_stream()
                     .to_string()
-                    .eq("spacetimedb :: table")
-            {
-                table_attrs.push(list.tokens.clone());
-            }
+                    .eq("spacetimedb :: table"))
+        {
+            table_attrs.push(list.tokens.clone());
         }
     }
 
diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Tamaro Skaljic<mail@tamaro-skaljic.de>"]
 name = "spacetimedsl_derive"
-version = "0.10.0"
+version = "0.11.0"
 edition = "2024"
 description = "Macros to extend SpacetimeDSL. You shouldn't depend on this directly and instead use the spacetimedsl crate."
 documentation = "https://docs.rs/spacetimedsl_derive"
@@ -19,16 +19,16 @@ proc-macro = true
 ident_case = "1.0.1"
 
 # https://crates.io/crates/proc_macro2 A substitute implementation of the compiler's `proc_macro` API to decouple token-based libraries from the procedural macro use case.
-proc-macro2 = "1.0"
+proc-macro2 = "1"
 
 # https://crates.io/crates/syn Parser for Rust source code
-syn = { version = "2.0.103" }
+syn = { version = "2" }
 
 # https://crates.io/crates/quote Quasi-quoting macro quote!(...)
-quote = "1.0"
+quote = "1"
 
 # https://crates.io/crates/rust-format A Rust source code formatting crate with a unified interface for string, file, and TokenStream input
 rust-format = { version = "0.3.4", features = [ "pretty_please", "token_stream" ]}
 
 # https://crates.io/crates/spacetimedsl_derive-input Contains structs which represent the output of SpacetimeDSL. Can be used by other proc-macro crates to build Macros which utilize SpacetimeDSL under the hood.
-spacetimedsl_derive-input = { version = "0.10.0", path = "../derive-input" }
+spacetimedsl_derive-input = { version = "0.11.0", path = "../derive-input" }
diff --git a/derive/src/lib.rs b/derive/src/lib.rs
@@ -98,11 +98,11 @@ fn is_last_dsl_attribute(derive_input: &syn::DeriveInput) -> bool {
 
 /// Make all struct fields private by setting their visibility to Inherited
 fn make_struct_fields_private(derive_input: &mut syn::DeriveInput) {
-    if let syn::Data::Struct(data_struct) = &mut derive_input.data {
-        if let syn::Fields::Named(fields) = &mut data_struct.fields {
-            for field in &mut fields.named {
-                field.vis = syn::Visibility::Inherited;
-            }
+    if let syn::Data::Struct(data_struct) = &mut derive_input.data
+        && let syn::Fields::Named(fields) = &mut data_struct.fields
+    {
+        for field in &mut fields.named {
+            field.vis = syn::Visibility::Inherited;
         }
     }
 }
diff --git a/example/Cargo.toml b/example/Cargo.toml
diff --git a/example/src/lib.rs b/example/src/lib.rs
diff --git a/format.cmd b/format.cmd

Original file line number	Diff line number	Diff line change
`@@ -17,16 +17,17 @@ impl SpacetimeDSLTable {`
`17`	`17`	`) -> syn::Result<(SpacetimeDBTable, SpacetimeDSLTable)> {`
`18`	`18`	`for unique_index_name in unique_indices {`
`19`	`19`	`for multi_column_index in &mut spacetimedb_table.multi_column_indices {`
`20`		`- if let IndexType::BTreeMultiColumn { columns: _ } = &multi_column_index.index_type {`
`21`		`- if multi_column_index.name.eq(&unique_index_name) {`
`22`		`- multi_column_index.is_unique = true;`
`23`		`- }`
	`20`	`+ if let IndexType::BTreeMultiColumn { columns: _ } = &multi_column_index.index_type`
	`21`	`+ && multi_column_index.name.eq(&unique_index_name)`
	`22`	`+ {`
	`23`	`+ multi_column_index.is_unique = true;`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`match column_args`
`29`	`29`	`.primary_key_column`
	`30`	`+ .as_ref()`
`30`	`31`	.expect("The table should have a `#[primary_key]` column!")
`31`	`32`	`.vis`
`32`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -98,11 +98,11 @@ fn is_last_dsl_attribute(derive_input: &syn::DeriveInput) -> bool {`
`98`	`98`
`99`	`99`	`/// Make all struct fields private by setting their visibility to Inherited`
`100`	`100`	`fn make_struct_fields_private(derive_input: &mut syn::DeriveInput) {`
`101`		`- if let syn::Data::Struct(data_struct) = &mut derive_input.data {`
`102`		`- if let syn::Fields::Named(fields) = &mut data_struct.fields {`
`103`		`- for field in &mut fields.named {`
`104`		`- field.vis = syn::Visibility::Inherited;`
`105`		`- }`
	`101`	`+ if let syn::Data::Struct(data_struct) = &mut derive_input.data`
	`102`	`+ && let syn::Fields::Named(fields) = &mut data_struct.fields`
	`103`	`+ {`
	`104`	`+ for field in &mut fields.named {`
	`105`	`+ field.vis = syn::Visibility::Inherited;`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`