pass 2

Author: carlsverre

demo/cloudflare-backend/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::await_holding_refcell_ref)]
+
 use std::cell::RefCell;
 
 use coordinator::Coordinator;
@@ -70,6 +72,7 @@ impl DurableObject for DocumentCoordinator {
             spawn_local(task.into_task());
             *self.coordinator.borrow_mut() = Some(coordinator);
         }
+
         let mut borrow = self.coordinator.borrow_mut();
         let coordinator = borrow.as_mut().unwrap();
 

justfile

@@ -21,6 +21,9 @@ test:
 build-wasm:
     just run-with-prefix 'wasm-'
 
+package:
+  just run-with-prefix 'package-'
+
 run-with-prefix prefix:
     #!/usr/bin/env bash
     set -euo pipefail

lib/sqlsync-reducer/examples/host.rs

@@ -56,7 +56,7 @@ fn main() -> anyhow::Result<()> {
                     log::info!("received query request: {} {:?}", sql, params);
                     let ptr = ffi.encode(
                         &mut store,
-                        &Ok::<_, ErrorResponse>(QueryResponse {
+                        Ok::<_, ErrorResponse>(QueryResponse {
                             columns: vec!["foo".into(), "bar".into()],
                             rows: vec![vec!["baz".into(), "qux".into()].into()],
                         }),
@@ -68,7 +68,7 @@ fn main() -> anyhow::Result<()> {
                     if sql == "FAIL" {
                         let ptr = ffi.encode(
                             &mut store,
-                            &Err::<ExecResponse, _>(ErrorResponse::SqliteError {
+                            Err::<ExecResponse, _>(ErrorResponse::SqliteError {
                                 code: 1,
                                 message: "error".to_string(),
                             }),
@@ -77,7 +77,7 @@ fn main() -> anyhow::Result<()> {
                     } else {
                         let ptr = ffi.encode(
                             &mut store,
-                            &Ok::<_, ErrorResponse>(ExecResponse { changes: 1 }),
+                            Ok::<_, ErrorResponse>(ExecResponse { changes: 1 }),
                         )?;
                         responses.insert(id, ptr);
                     }

lib/sqlsync-worker/sqlsync-wasm/src/utils.rs

@@ -112,7 +112,7 @@ pub async fn fetch_reducer(reducer_url: &str) -> Result<(WasmReducer, Vec<u8>),
         )));
     }
 
-    let mut reducer_wasm_bytes = resp.binary().await?;
+    let reducer_wasm_bytes = resp.binary().await?;
 
     let global = js_sys::global()
         .dyn_into::<js_sys::Object>()
@@ -130,10 +130,9 @@ pub async fn fetch_reducer(reducer_url: &str) -> Result<(WasmReducer, Vec<u8>),
         // sha256 sum the data
         // TODO: it would be much better to stream the data through the hash function
         // but afaik that's not doable with the crypto.subtle api
-        let digest = JsFuture::from(
-            subtle.digest_with_str_and_u8_array("SHA-256", &mut reducer_wasm_bytes)?,
-        )
-        .await?;
+        let digest =
+            JsFuture::from(subtle.digest_with_str_and_u8_array("SHA-256", &reducer_wasm_bytes)?)
+                .await?;
         Uint8Array::new(&digest).to_vec()
     };
 

lib/sqlsync/examples/end-to-end-local-net.rs

@@ -22,16 +22,16 @@ use sqlsync::WasmReducer;
 use serde::{Deserialize, Serialize};
 use sqlsync::{coordinator::CoordinatorDocument, MemoryJournal};
 
-fn serialize_into<W, T: ?Sized>(writer: W, value: &T) -> io::Result<()>
+fn serialize_into<W, T>(writer: W, value: &T) -> io::Result<()>
 where
     W: std::io::Write,
-    T: serde::Serialize,
+    T: serde::Serialize + ?Sized,
 {
     match bincode::serialize_into(writer, value) {
         Ok(_) => Ok(()),
         Err(err) => match err.as_ref() {
             ErrorKind::Io(err) => Err(err.kind().into()),
-            _ => Err(io::Error::new(io::ErrorKind::Other, err)),
+            _ => Err(io::Error::other(err)),
         },
     }
 }
@@ -45,7 +45,7 @@ where
         Ok(v) => Ok(v),
         Err(err) => match err.as_ref() {
             ErrorKind::Io(err) => Err(err.kind().into()),
-            _ => Err(io::Error::new(io::ErrorKind::Other, err)),
+            _ => Err(io::Error::other(err)),
         },
     }
 }

lib/sqlsync/src/positioned_io.rs

@@ -1,13 +1,11 @@
-use std::io::{self, Read, Seek, SeekFrom, Write};
+//! The traits in this file copy certain methods and docstrings from the position-io module
+//! https://crates.io/crates/positioned-io
+//! postioned-io is under the MIT license
+//!
+//! They are copied here as the positioned-io crate takes a lot of dependencies
+//! on std::File which we don't need or want due to Wasm limitations.
 
-/**
- * The traits in this file copy certain methods and docstrings from the position-io module
- * https://crates.io/crates/positioned-io
- * postioned-io is under the MIT license
- *
- * They are copied here as the positioned-io crate takes a lot of dependencies
- * on std::File which we don't need or want due to Wasm limitations.
- */
+use std::io::{self, Read, Seek, SeekFrom, Write};
 
 pub trait PositionedReader {
     /// Reads bytes from an offset in this source into a buffer, returning how
@@ -120,7 +118,7 @@ impl PositionedReader for Vec<u8> {
     }
 }
 
-impl<'a> PositionedReader for &'a [u8] {
+impl PositionedReader for &[u8] {
     fn read_at(&self, pos: usize, buf: &mut [u8]) -> io::Result<usize> {
         if pos >= self.len() {
             return Ok(0);
@@ -195,7 +193,7 @@ impl<I: PositionedReader> Seek for PositionedCursor<I> {
 
 // Ref implementations
 
-impl<'a, T: ?Sized + PositionedReader> PositionedReader for &'a T {
+impl<T: ?Sized + PositionedReader> PositionedReader for &T {
     fn read_at(&self, pos: usize, buf: &mut [u8]) -> io::Result<usize> {
         T::read_at(self, pos, buf)
     }
@@ -205,7 +203,7 @@ impl<'a, T: ?Sized + PositionedReader> PositionedReader for &'a T {
     }
 }
 
-impl<'a, T: ?Sized + PositionedReader> PositionedReader for &'a mut T {
+impl<T: ?Sized + PositionedReader> PositionedReader for &mut T {
     fn read_at(&self, pos: usize, buf: &mut [u8]) -> io::Result<usize> {
         T::read_at(self, pos, buf)
     }
@@ -215,7 +213,7 @@ impl<'a, T: ?Sized + PositionedReader> PositionedReader for &'a mut T {
     }
 }
 
-impl<'a, T: ?Sized + PositionedWriter> PositionedWriter for &'a mut T {
+impl<T: ?Sized + PositionedWriter> PositionedWriter for &mut T {
     fn write_at(&mut self, pos: usize, buf: &[u8]) -> io::Result<usize> {
         T::write_at(self, pos, buf)
     }