Bump Rust to 1.88 + run cargo clippy --tests --benches --all --fix

Author: Centril

.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.87.0
+      image: rust:1.88.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

@@ -90,7 +90,7 @@ debug = true
 version = "1.2.0"
 edition = "2021"
 # update rust-toolchain.toml too!
-rust-version = "1.87.0"
+rust-version = "1.88.0"
 
 [workspace.dependencies]
 spacetimedb = { path = "crates/bindings", version = "1.2.0" }

crates/bench/Dockerfile

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

crates/bench/src/bin/summarize.rs

@@ -99,7 +99,7 @@ mod criterion {
 
     /// `"{crit_dir}/"{name}.json"`
     fn packed_baseline_json_path(crit_dir: &Path, name: &str) -> PathBuf {
-        crit_dir.join(format!("{}.json", name))
+        crit_dir.join(format!("{name}.json"))
     }
 
     lazy_static::lazy_static! {
@@ -392,7 +392,7 @@ mod callgrind {
     }
 
     fn packed_json_path(iai_callgrind_dir: &Path, name: &str) -> PathBuf {
-        iai_callgrind_dir.join(format!("{}.json", name))
+        iai_callgrind_dir.join(format!("{name}.json"))
     }
 
     fn get_iai_callgrind_dir(target_dir: &Path) -> PathBuf {

crates/bench/src/spacetime_module.rs

@@ -70,10 +70,10 @@ impl<L: ModuleLanguage> BenchDatabase for SpacetimeModule<L> {
         });
 
         for table in module.client.module.info.module_def.tables() {
-            log::trace!("SPACETIME_MODULE: LOADED TABLE: {:?}", table);
+            log::trace!("SPACETIME_MODULE: LOADED TABLE: {table:?}");
         }
         for reducer in module.client.module.info.module_def.reducers() {
-            log::trace!("SPACETIME_MODULE: LOADED REDUCER: {:?}", reducer);
+            log::trace!("SPACETIME_MODULE: LOADED REDUCER: {reducer:?}");
         }
         Ok(SpacetimeModule {
             runtime,

crates/bindings-macro/src/table.rs

@@ -800,7 +800,7 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
     if std::env::var("PROC_MACRO_DEBUG").is_ok() {
         {
             #![allow(clippy::disallowed_macros)]
-            println!("{}", emission);
+            println!("{emission}");
         }
     }
 

crates/bindings-macro/src/util.rs

@@ -76,7 +76,7 @@ pub(crate) fn one_of(options: &[crate::sym::Symbol]) -> String {
         }
         _ => {
             let join = options.join("`, `");
-            format!("expected one of: `{}`", join)
+            format!("expected one of: `{join}`")
         }
     }
 }

crates/bindings/src/lib.rs

@@ -810,7 +810,7 @@ const DEFAULT_BUFFER_CAPACITY: usize = spacetimedb_primitives::ROW_ITER_CHUNK_SI
 #[doc(hidden)]
 pub fn table_id_from_name(table_name: &str) -> TableId {
     sys::table_id_from_name(table_name).unwrap_or_else(|_| {
-        panic!("Failed to get table with name: {}", table_name);
+        panic!("Failed to get table with name: {table_name}");
     })
 }
 

crates/cli/build.rs

@@ -4,5 +4,5 @@ use std::process::Command;
 fn main() {
     let output = Command::new("git").args(["rev-parse", "HEAD"]).output().unwrap();
     let git_hash = String::from_utf8(output.stdout).unwrap();
-    println!("cargo:rustc-env=GIT_HASH={}", git_hash);
+    println!("cargo:rustc-env=GIT_HASH={git_hash}");
 }

crates/cli/src/subcommands/call.rs

@@ -16,10 +16,7 @@ use super::sql::parse_req;
 
 pub fn cli() -> clap::Command {
     clap::Command::new("call")
-        .about(format!(
-            "Invokes a reducer function in a database. {}",
-            UNSTABLE_WARNING
-        ))
+        .about(format!("Invokes a reducer function in a database. {UNSTABLE_WARNING}"))
         .arg(
             Arg::new("database")
                 .required(true)
@@ -38,7 +35,7 @@ pub fn cli() -> clap::Command {
 }
 
 pub async fn exec(config: Config, args: &ArgMatches) -> Result<(), Error> {
-    eprintln!("{}\n", UNSTABLE_WARNING);
+    eprintln!("{UNSTABLE_WARNING}\n");
     let reducer_name = args.get_one::<String>("reducer_name").unwrap();
     let arguments = args.get_many::<String>("arguments");
 
@@ -60,7 +57,7 @@ pub async fn exec(config: Config, args: &ArgMatches) -> Result<(), Error> {
         .zip(&*reducer_def.params.elements)
         .map(|(argument, element)| match &element.algebraic_type {
             AlgebraicType::String if !argument.starts_with('\"') || !argument.ends_with('\"') => {
-                format!("\"{}\"", argument)
+                format!("\"{argument}\"")
             }
             _ => argument.to_string(),
         });
@@ -74,7 +71,7 @@ pub async fn exec(config: Config, args: &ArgMatches) -> Result<(), Error> {
             bail!(e);
         };
 
-        let error = Err(e).context(format!("Response text: {}", response_text));
+        let error = Err(e).context(format!("Response text: {response_text}"));
 
         let error_msg = if response_text.starts_with("no such reducer") {
             no_such_reducer(&database_identity, database, reducer_name, &module_def)
@@ -106,8 +103,7 @@ fn invalid_arguments(
     if let Some((actual, expected)) = find_actual_expected(text).filter(|(a, e)| a != e) {
         write!(
             error,
-            "\n\n{} parameters were expected, but {} were provided.",
-            expected, actual
+            "\n\n{expected} parameters were expected, but {actual} were provided."
         )
         .unwrap();
     }
@@ -170,10 +166,8 @@ impl std::fmt::Display for ReducerSignature<'_> {
 
 /// Returns an error message for when `reducer` does not exist in `db`.
 fn no_such_reducer(database_identity: &Identity, db: &str, reducer: &str, module_def: &ModuleDef) -> String {
-    let mut error = format!(
-        "No such reducer `{}` for database `{}` resolving to identity `{}`.",
-        reducer, db, database_identity
-    );
+    let mut error =
+        format!("No such reducer `{reducer}` for database `{db}` resolving to identity `{database_identity}`.");
 
     add_reducer_ctx_to_err(&mut error, module_def, reducer);
 
@@ -192,7 +186,7 @@ fn add_reducer_ctx_to_err(error: &mut String, module_def: &ModuleDef, reducer_na
         .collect::<Vec<_>>();
 
     if let Some(best) = find_best_match_for_name(&reducers, reducer_name, None) {
-        write!(error, "\n\nA reducer with a similar name exists: `{}`", best).unwrap();
+        write!(error, "\n\nA reducer with a similar name exists: `{best}`").unwrap();
     } else if reducers.is_empty() {
         write!(error, "\n\nThe database has no reducers.").unwrap();
     } else {
@@ -207,13 +201,13 @@ fn add_reducer_ctx_to_err(error: &mut String, module_def: &ModuleDef, reducer_na
         // List them.
         write!(error, "\n\nHere are some existing reducers:").unwrap();
         for candidate in reducers {
-            write!(error, "\n- {}", candidate).unwrap();
+            write!(error, "\n- {candidate}").unwrap();
         }
 
         // When some where not listed, note that are more.
         if too_many_to_show {
             let plural = if diff == 1 { "" } else { "s" };
-            write!(error, "\n... ({} reducer{} not shown)", diff, plural).unwrap();
+            write!(error, "\n... ({diff} reducer{plural} not shown)").unwrap();
         }
     }
 }