Run cargo fmt (#99)

crates/bindings-macro/src/lib.rs

@@ -508,7 +508,9 @@ enum ColumnAttr {
 
 impl ColumnAttr {
     fn parse(attr: &syn::Attribute) -> syn::Result<Option<Self>> {
-        let Some(ident) = attr.path().get_ident() else { return Ok(None) };
+        let Some(ident) = attr.path().get_ident() else {
+            return Ok(None);
+        };
         Ok(if ident == sym::UNIQUE {
             attr.meta.require_path_only()?;
             Some(ColumnAttr::Unique(ident.span()))
@@ -530,7 +532,7 @@ fn spacetimedb_tabletype_impl(item: syn::DeriveInput) -> syn::Result<TokenStream
     let original_struct_ident = sats_ty.ident;
     let table_name = &sats_ty.name;
     let module::SatsTypeData::Product(fields) = &sats_ty.data else {
-        return Err(syn::Error::new(Span::call_site(), "spacetimedb table must be a struct"))
+        return Err(syn::Error::new(Span::call_site(), "spacetimedb table must be a struct"));
     };
 
     let mut columns = Vec::<Column>::new();
@@ -608,7 +610,9 @@ fn spacetimedb_tabletype_impl(item: syn::DeriveInput) -> syn::Result<TokenStream
             continue;
         }
         let args = attr.parse_args::<MacroInput>()?;
-        let MacroInput::Index { ty, name, field_names } = args else { continue };
+        let MacroInput::Index { ty, name, field_names } = args else {
+            continue;
+        };
         let col_ids = field_names
             .iter()
             .map(|ident| {

crates/cli/src/subcommands/call.rs

@@ -250,15 +250,20 @@ fn find_of_type_in_schema<'v, 't: 'v>(
     value: &'v serde_json::Value,
     ty: &'t str,
 ) -> impl Iterator<Item = (&'v str, &'v Value)> {
-    let Some(entities) = value.as_object()
+    let Some(entities) = value
+        .as_object()
         .and_then(|o| o.get("entities"))
         .and_then(|e| e.as_object())
-    else { return Either::Left(iter::empty()) };
+    else {
+        return Either::Left(iter::empty());
+    };
 
     let iter = entities
         .into_iter()
         .filter(|(_, value)| {
-            let Some(obj) = value.as_object() else { return false; };
+            let Some(obj) = value.as_object() else {
+                return false;
+            };
             obj.get("type").filter(|x| x.as_str() == Some(ty)).is_some()
         })
         .map(|(key, value)| (key.as_str(), value));

crates/cli/src/tasks.rs

@@ -83,8 +83,12 @@ disallowed-macros = [
 
 fn check_for_wasm_bindgen(artifact: &Path) -> anyhow::Result<()> {
     // if this fails for some reason, just let it fail elsewhere
-    let Ok(file) = fs::File::open(artifact) else { return Ok(()) };
-    let Ok(module) = wasmbin::Module::decode_from(&mut io::BufReader::new(file)) else { return Ok(()) };
+    let Ok(file) = fs::File::open(artifact) else {
+        return Ok(());
+    };
+    let Ok(module) = wasmbin::Module::decode_from(&mut io::BufReader::new(file)) else {
+        return Ok(());
+    };
     if has_wasm_bindgen(&module) {
         anyhow::bail!(
             "wasm-bindgen detected.\n\

crates/core/src/db/relational_db.rs

@@ -315,7 +315,9 @@ impl RelationalDB {
         col_id: u32,
     ) -> Result<Option<ColumnIndexAttribute>, DBError> {
         let table = self.inner.schema_for_table_mut_tx(tx, TableId(table_id))?;
-        let Some(column) = table.columns.get(col_id as usize) else { return Ok(None) };
+        let Some(column) = table.columns.get(col_id as usize) else {
+            return Ok(None);
+        };
         let unique_index = table.indexes.iter().find(|x| x.col_id == col_id).map(|x| x.is_unique);
         Ok(Some(match (column.is_autoinc, unique_index) {
             (true, Some(true)) => ColumnIndexAttribute::Identity,

crates/core/src/host/scheduler.rs

@@ -259,8 +259,12 @@ impl SchedulerActor {
     }
 
     async fn handle_queued(&self, id: ScheduledReducerId) {
-        let Some(module_host) = self.module_host.upgrade() else { return };
-        let Some(scheduled) = self.db.get(id.0.to_le_bytes()).unwrap() else { return };
+        let Some(module_host) = self.module_host.upgrade() else {
+            return;
+        };
+        let Some(scheduled) = self.db.get(id.0.to_le_bytes()).unwrap() else {
+            return;
+        };
         let scheduled: ScheduledReducer = bsatn::from_slice(&scheduled).unwrap();
         let db = self.db.clone();
         tokio::spawn(async move {

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

@@ -70,11 +70,17 @@ pub fn determine_spacetime_abi(wasm_module: &[u8]) -> Result<VersionTuple, AbiVe
     let ver = if export_is_addr {
         let mut datas = datas.ok_or(AbiVersionError::Malformed)?;
         let data = datas.read().unwrap();
-        let wasmparser::DataKind::Active { memory_index: 0, offset_expr } = data.kind else {
+        let wasmparser::DataKind::Active {
+            memory_index: 0,
+            offset_expr,
+        } = data.kind
+        else {
             return Err(AbiVersionError::Malformed);
         };
         let offset_op = offset_expr.get_operators_reader().read().unwrap();
-        let wasmparser::Operator::I32Const { value: offset } = offset_op else { unreachable!("determine_spacetime_abi:I32Const?") };
+        let wasmparser::Operator::I32Const { value: offset } = offset_op else {
+            unreachable!("determine_spacetime_abi:I32Const?")
+        };
         let slice = value
             .checked_sub(offset)
             .and_then(|idx| data.data.get(idx as usize..)?.get(..4))

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

@@ -843,7 +843,9 @@ impl<T: WasmInstance> WasmInstanceActor<T> {
         for (col_id, col) in columns.iter().enumerate() {
             let mut index_for_column = None;
             for index in table.indexes.iter() {
-                let [index_col_id] = *index.col_ids else { anyhow::bail!("multi-column indexes not yet supported") };
+                let [index_col_id] = *index.col_ids else {
+                    anyhow::bail!("multi-column indexes not yet supported")
+                };
                 if index_col_id as usize != col_id {
                     continue;
                 }

crates/core/src/host/wasmer/wasm_instance_env.rs

@@ -52,7 +52,9 @@ impl WasmInstanceEnv {
         // Call `f` with the caller and a handle to the memory.
         // Bail if there were no errors.
         let mem = caller.data().mem();
-        let Err(err) = f(caller.as_mut(), &mem) else { return Ok(0) };
+        let Err(err) = f(caller.as_mut(), &mem) else {
+            return Ok(0);
+        };
 
         // Handle any errors.
         Err(match err {

crates/core/src/util/future_queue.rs

@@ -54,7 +54,9 @@ where
             if !me.fut.is_terminated() {
                 return me.fut.poll(cx).map(Some);
             }
-            let Some(item) = me.queue.pop_front() else { return Poll::Ready(None) };
+            let Some(item) = me.queue.pop_front() else {
+                return Poll::Ready(None);
+            };
             let fut = (me.f)(item);
             me.fut.as_mut().set(fut.fuse());
         }

crates/sdk/src/callbacks.rs

@@ -710,7 +710,8 @@ impl ReducerCallbacks {
             status,
             message,
             ..
-        } = event else {
+        } = event
+        else {
             log::warn!("Received Event with function_call of None");
             return None;
         };