From 751da204e0c2312cad5ed619e3ac44efe327a813 Mon Sep 17 00:00:00 2001 From: j gilles Date: Tue, 25 Jul 2023 12:53:56 -0400 Subject: [PATCH] Run cargo fmt (#99) --- crates/bindings-macro/src/lib.rs | 10 +++++++--- crates/cli/src/subcommands/call.rs | 11 ++++++++--- crates/cli/src/tasks.rs | 8 ++++++-- crates/core/src/db/relational_db.rs | 4 +++- crates/core/src/host/scheduler.rs | 8 ++++++-- crates/core/src/host/wasm_common/abi.rs | 10 ++++++++-- crates/core/src/host/wasm_common/module_host_actor.rs | 4 +++- crates/core/src/host/wasmer/wasm_instance_env.rs | 4 +++- crates/core/src/util/future_queue.rs | 4 +++- crates/sdk/src/callbacks.rs | 3 ++- 10 files changed, 49 insertions(+), 17 deletions(-) diff --git a/crates/bindings-macro/src/lib.rs b/crates/bindings-macro/src/lib.rs index f7ad6cb94a..9c36a84f8a 100644 --- a/crates/bindings-macro/src/lib.rs +++ b/crates/bindings-macro/src/lib.rs @@ -508,7 +508,9 @@ enum ColumnAttr { impl ColumnAttr { fn parse(attr: &syn::Attribute) -> syn::Result> { - 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::new(); @@ -608,7 +610,9 @@ fn spacetimedb_tabletype_impl(item: syn::DeriveInput) -> syn::Result()?; - 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| { diff --git a/crates/cli/src/subcommands/call.rs b/crates/cli/src/subcommands/call.rs index b425bc5a2f..b74e700fdb 100644 --- a/crates/cli/src/subcommands/call.rs +++ b/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 { - 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)); diff --git a/crates/cli/src/tasks.rs b/crates/cli/src/tasks.rs index 72ae70ba0e..4fd75cba17 100644 --- a/crates/cli/src/tasks.rs +++ b/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\ diff --git a/crates/core/src/db/relational_db.rs b/crates/core/src/db/relational_db.rs index 7b187fd757..5a4e927bc1 100644 --- a/crates/core/src/db/relational_db.rs +++ b/crates/core/src/db/relational_db.rs @@ -315,7 +315,9 @@ impl RelationalDB { col_id: u32, ) -> Result, 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, diff --git a/crates/core/src/host/scheduler.rs b/crates/core/src/host/scheduler.rs index 4f8e4a6c15..bd40200a4f 100644 --- a/crates/core/src/host/scheduler.rs +++ b/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 { diff --git a/crates/core/src/host/wasm_common/abi.rs b/crates/core/src/host/wasm_common/abi.rs index c9cb07c45a..0d89b57d14 100644 --- a/crates/core/src/host/wasm_common/abi.rs +++ b/crates/core/src/host/wasm_common/abi.rs @@ -70,11 +70,17 @@ pub fn determine_spacetime_abi(wasm_module: &[u8]) -> Result WasmInstanceActor { 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; } diff --git a/crates/core/src/host/wasmer/wasm_instance_env.rs b/crates/core/src/host/wasmer/wasm_instance_env.rs index c75bbe6268..d0575e635f 100644 --- a/crates/core/src/host/wasmer/wasm_instance_env.rs +++ b/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 { diff --git a/crates/core/src/util/future_queue.rs b/crates/core/src/util/future_queue.rs index 4cf9ae286a..44afa063df 100644 --- a/crates/core/src/util/future_queue.rs +++ b/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()); } diff --git a/crates/sdk/src/callbacks.rs b/crates/sdk/src/callbacks.rs index d0ca57089a..752015210b 100644 --- a/crates/sdk/src/callbacks.rs +++ b/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; };