Bump Rust to 1.93.0

.github/Dockerfile

@@ -1,5 +1,5 @@
 # Minimal Dockerfile that just wraps pre-built binaries, so we can test the server inside docker
-FROM rust:1.90.0
+FROM rust:1.93.0
 RUN mkdir -p /stdb/data
 COPY ./target/debug/spacetimedb-standalone ./target/debug/spacetimedb-cli /usr/local/bin/
 COPY ./crates/standalone/config.toml /stdb/data/config.toml

.github/workflows/benchmarks.yml

@@ -183,7 +183,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20 # on a successful run, runs in 8 minutes
     container:
-      image: rust:1.90.0
+      image: rust:1.93.0
       options: --privileged
     # filter for a comment containing 'benchmarks please'
     if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}

Cargo.toml

@@ -103,7 +103,7 @@ debug = true
 version = "1.11.3"
 edition = "2021"
 # update rust-toolchain.toml too!
-rust-version = "1.90.0"
+rust-version = "1.93.0"
 
 [workspace.dependencies]
 spacetimedb = { path = "crates/bindings", version = "=1.11.3" }

crates/bench/Dockerfile

@@ -3,7 +3,7 @@
 # See the README for commands to run.
 
 # sync with: ../../rust-toolchain.toml
-FROM rust:1.90.0
+FROM rust:1.93.0
 
 RUN apt-get update && \
     apt-get install -y valgrind bash && \

crates/bindings/src/rt.rs

@@ -67,6 +67,7 @@ pub fn invoke_procedure<'a, A: Args<'a>, Ret: IntoProcedureResult>(
 }
 
 /// A trait for types representing the *execution logic* of a reducer.
+#[expect(clippy::duplicated_attributes, reason = "false positive")]
 #[diagnostic::on_unimplemented(
     message = "invalid reducer signature",
     label = "this reducer signature is not valid",
@@ -95,6 +96,7 @@ pub fn invoke_view<'a, A: Args<'a>, T: ViewReturn>(
     std::mem::take(&mut *buf)
 }
 /// A trait for types representing the execution logic of a caller-specific view.
+#[expect(clippy::duplicated_attributes, reason = "false positive")]
 #[diagnostic::on_unimplemented(
     message = "invalid view signature",
     label = "this view signature is not valid",
@@ -123,6 +125,7 @@ pub fn invoke_anonymous_view<'a, A: Args<'a>, T: ViewReturn>(
     std::mem::take(&mut *buf)
 }
 /// A trait for types representing the execution logic of an anonymous view.
+#[expect(clippy::duplicated_attributes, reason = "false positive")]
 #[diagnostic::on_unimplemented(
     message = "invalid anonymous view signature",
     label = "this view signature is not valid",

crates/core/src/error.rs

@@ -3,7 +3,6 @@ use std::num::ParseIntError;
 use std::path::PathBuf;
 use std::sync::{MutexGuard, PoisonError};
 
-use enum_as_inner::EnumAsInner;
 use hex::FromHexError;
 use spacetimedb_commitlog::repo::TxOffset;
 use spacetimedb_durability::DurabilityExited;
@@ -96,7 +95,7 @@ impl From<LockError> for DatabaseError {
     }
 }
 
-#[derive(Error, Debug, EnumAsInner)]
+#[derive(Error, Debug)]
 pub enum DBError {
     #[error("LibError: {0}")]
     Lib(#[from] LibError),

crates/core/src/host/wasm_common/module_host_actor.rs

@@ -1275,7 +1275,6 @@ impl InstanceCommon {
     ) -> (ViewCallResult, bool) {
         let view_calls = tx
             .view_for_update()
-            .cloned()
             .map(|info| {
                 let view_def = module_def
                     .get_view_by_id(info.fn_ptr, info.sender.is_none())

crates/core/src/subscription/websocket_building.rs

@@ -82,8 +82,10 @@ pub struct BsatnRowListBuilder {
 }
 
 /// A [`RowSizeHint`] under construction.
+#[derive(Default)]
 pub enum RowSizeHintBuilder {
     /// We haven't seen any rows yet.
+    #[default]
     Empty,
     /// Each row in `rows_data` is of the same fixed size as specified here
     /// but we don't know whether the size fits in `RowSize`
@@ -107,12 +109,6 @@ impl BsatnRowListBuilder {
     }
 }
 
-impl Default for RowSizeHintBuilder {
-    fn default() -> Self {
-        Self::Empty
-    }
-}
-
 impl RowListBuilder for BsatnRowListBuilder {
     type FinishedList = BsatnRowList;
 

crates/datastore/src/error.rs

@@ -1,5 +1,4 @@
 use super::system_tables::SystemTable;
-use enum_as_inner::EnumAsInner;
 use spacetimedb_lib::db::raw_def::{v9::RawSql, RawIndexDefV8};
 use spacetimedb_primitives::{ColId, ColList, IndexId, SequenceId, TableId, ViewId};
 use spacetimedb_sats::buffer::DecodeError;
@@ -13,7 +12,7 @@ use spacetimedb_table::{
 };
 use thiserror::Error;
 
-#[derive(Error, Debug, EnumAsInner)]
+#[derive(Error, Debug)]
 pub enum DatastoreError {
     #[error("LibError: {0}")]
     Lib(#[from] LibError),
@@ -61,7 +60,7 @@ pub enum ViewError {
     SerializeArgs,
 }
 
-#[derive(Error, Debug, EnumAsInner)]
+#[derive(Error, Debug)]
 pub enum TableError {
     #[error("Table with name `{0}` start with 'st_' and that is reserved for internal system tables.")]
     System(Box<str>),

crates/datastore/src/execution_context.rs

@@ -137,24 +137,19 @@ impl Workload {
 /// A transaction can be executing a reducer.
 /// It can be used to satisfy a one-off sql query or subscription.
 /// It can also be an internal operation that is not associated with a reducer or sql request.
-#[derive(Clone, Copy, Display, Hash, PartialEq, Eq, strum::AsRefStr, enum_map::Enum)]
+#[derive(Clone, Copy, Display, Hash, PartialEq, Eq, Default, strum::AsRefStr, enum_map::Enum)]
 pub enum WorkloadType {
     Reducer,
     Sql,
     Subscribe,
     Unsubscribe,
     Update,
+    #[default]
     Internal,
     View,
     Procedure,
 }
 
-impl Default for WorkloadType {
-    fn default() -> Self {
-        Self::Internal
-    }
-}
-
 impl ExecutionContext {
     /// Returns an [ExecutionContext] with the provided parameters and empty metrics.
     fn new(database_identity: Identity, reducer: Option<ReducerContext>, workload: WorkloadType) -> Self {

crates/datastore/src/locking_tx_datastore/datastore.rs

@@ -2597,9 +2597,10 @@ mod tests {
     }
 
     fn expect_index_err(res: Result<impl fmt::Debug>) -> IndexError {
-        res.expect_err("`res` should be an error")
-            .into_index()
-            .expect("the error should be an `IndexError`")
+        match res.expect_err("`res` should be an error") {
+            DatastoreError::Index(err) => err,
+            _ => panic!("the error should be an `IndexError`"),
+        }
     }
 
     fn test_under_tx_and_commit(
@@ -2627,14 +2628,12 @@ mod tests {
             let _ = row.pop().expect("there should be an element to remove");
             let row = row.into();
             // Now attempt the update.
-            let err = update(&datastore, tx, table_id, index_id, &row)
-                .expect_err("the update should fail")
-                .into_table()
-                .expect("the error should be a `TableError`")
-                .into_bflatn()
-                .expect("the error should be a bflatn error");
-
-            assert_matches!(err, spacetimedb_table::bflatn_to::Error::Decode(..));
+            let err = update(&datastore, tx, table_id, index_id, &row).expect_err("the update should fail");
+
+            assert_matches!(
+                err,
+                DatastoreError::Table(TableError::Bflatn(spacetimedb_table::bflatn_to::Error::Decode(..)))
+            );
             Ok(())
         })
     }

crates/standalone/Dockerfile

@@ -1,7 +1,7 @@
 ARG CARGO_PROFILE=release
 
 
-FROM rust:1.90.0 AS chef
+FROM rust:1.93.0 AS chef
 RUN rust_target=$(rustc -vV | awk '/^host:/{ print $2 }') && \
   curl https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-$rust_target.tgz -fL | tar xz -C $CARGO_HOME/bin
 RUN cargo binstall -y cargo-chef@0.1.70

crates/standalone/src/control_db/tests.rs

@@ -135,15 +135,14 @@ fn test_decode() -> ResultTest<()> {
     assert_eq!(dbs.len(), 1);
     assert_eq!(dbs[0].owner_identity, id);
 
-    let mut new_replica = Replica {
+    let new_replica = Replica {
         id: 0,
         database_id: 1,
         node_id: 0,
         leader: true,
     };
 
-    let id = cdb.insert_replica(new_replica.clone())?;
-    new_replica.id = id;
+    let id = cdb.insert_replica(new_replica)?;
 
     let dbs = cdb.get_replicas()?;
 

crates/standalone/src/lib.rs

@@ -267,7 +267,7 @@ impl spacetimedb_client_api::ControlStateWriteAccess for StandaloneEnv {
             None => {
                 let program = Program::from_bytes(&spec.program_bytes[..]);
 
-                let mut database = Database {
+                let database = Database {
                     id: 0,
                     database_identity: spec.database_identity,
                     owner_identity: *publisher,
@@ -287,8 +287,7 @@ impl spacetimedb_client_api::ControlStateWriteAccess for StandaloneEnv {
 
                 debug_assert_eq!(_hash_for_assert, program_hash);
 
-                let database_id = self.control_db.insert_database(database.clone())?;
-                database.id = database_id;
+                let database_id = self.control_db.insert_database(database)?;
 
                 self.schedule_replicas(database_id, num_replicas).await?;
 

rust-toolchain.toml

@@ -1,8 +1,8 @@
 [toolchain]
-# change crates/{standalone,bench}/Dockerfile, and the docker image tag in
+# change crates/{standalone,bench}/Dockerfile, .github/Dockerfile, and the docker image tag in
 # .github/workflows/benchmarks.yml:jobs/callgrind_benchmark/container/image
 # maybe also the rust-version in Cargo.toml
-channel = "1.90.0"
+channel = "1.93.0"
 profile = "default"
 targets = ["wasm32-unknown-unknown"]
 components = ["rust-src"]

tools/xtask-llm-benchmark/src/bin/llm_benchmark.rs

@@ -888,7 +888,7 @@ async fn run_many_routes_for_mode(
     let host = config.host.clone();
     let details_path = config.details_path.clone();
 
-    futures::stream::iter(routes.iter().cloned().map(|route| {
+    futures::stream::iter(routes.iter().map(|route| {
         let host = host.clone();
         let details_path = details_path.clone();
 
@@ -899,7 +899,7 @@ async fn run_many_routes_for_mode(
                 bench_root,
                 mode,
                 hash,
-                route: &route,
+                route,
                 context,
                 llm,
                 lang,