From cfc8728774bf914e1156b6907b9bff996eacfa73 Mon Sep 17 00:00:00 2001 From: Nikita Sivukhin Date: Fri, 19 Sep 2025 13:25:52 +0400 Subject: [PATCH] fix clippy --- bindings/javascript/src/browser.rs | 26 +++++++++++++------------- bindings/javascript/sync/src/lib.rs | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bindings/javascript/src/browser.rs b/bindings/javascript/src/browser.rs index 4ebae0a59..16b071ec8 100644 --- a/bindings/javascript/src/browser.rs +++ b/bindings/javascript/src/browser.rs @@ -64,7 +64,7 @@ pub struct OpfsInner { } thread_local! { - static OPFS: Arc = Arc::new(Opfs::new()); + static OPFS: Arc = Arc::new(Opfs::default()); } #[napi] @@ -74,9 +74,6 @@ struct OpfsFile { opfs: Opfs, } -// unsafe impl Send for OpfsFile {} -// unsafe impl Sync for OpfsFile {} - unsafe impl Send for Opfs {} unsafe impl Sync for Opfs {} @@ -107,15 +104,6 @@ pub fn opfs() -> Arc { } impl Opfs { - pub fn new() -> Self { - Self { - inner: Arc::new(OpfsInner { - completion_no: RefCell::new(0), - completions: RefCell::new(HashMap::new()), - }), - } - } - pub fn complete(&self, completion_no: u32, result: i32) { let completion = { let mut completions = self.inner.completions.borrow_mut(); @@ -148,6 +136,18 @@ impl Clock for Opfs { } } +impl Default for Opfs { + fn default() -> Self { + Self { + #[allow(clippy::arc_with_non_send_sync)] + inner: Arc::new(OpfsInner { + completion_no: RefCell::new(0), + completions: RefCell::new(HashMap::new()), + }), + } + } +} + #[link(wasm_import_module = "env")] extern "C" { fn lookup_file(path: *const u8, path_len: usize) -> i32; diff --git a/bindings/javascript/sync/src/lib.rs b/bindings/javascript/sync/src/lib.rs index 3223b0795..f851af991 100644 --- a/bindings/javascript/sync/src/lib.rs +++ b/bindings/javascript/sync/src/lib.rs @@ -255,7 +255,7 @@ impl SyncEngine { #[napi] pub fn push(&self) -> GeneratorHolder { self.run(async move |coro, guard| { - let sync_engine = try_read(&guard)?; + let sync_engine = try_read(guard)?; let sync_engine = try_unwrap(&sync_engine)?; sync_engine.push_changes_to_remote(coro).await?; Ok(None) @@ -265,7 +265,7 @@ impl SyncEngine { #[napi] pub fn stats(&self) -> GeneratorHolder { self.run(async move |coro, guard| { - let sync_engine = try_read(&guard)?; + let sync_engine = try_read(guard)?; let sync_engine = try_unwrap(&sync_engine)?; let stats = sync_engine.stats(coro).await?; Ok(Some(GeneratorResponse::SyncEngineStats { @@ -282,7 +282,7 @@ impl SyncEngine { #[napi] pub fn wait(&self) -> GeneratorHolder { self.run(async move |coro, guard| { - let sync_engine = try_read(&guard)?; + let sync_engine = try_read(guard)?; let sync_engine = try_unwrap(&sync_engine)?; Ok(Some(GeneratorResponse::SyncEngineChanges { changes: SyncEngineChanges { @@ -296,7 +296,7 @@ impl SyncEngine { pub fn apply(&self, changes: &mut SyncEngineChanges) -> GeneratorHolder { let status = changes.status.take().unwrap(); self.run(async move |coro, guard| { - let sync_engine = try_read(&guard)?; + let sync_engine = try_read(guard)?; let sync_engine = try_unwrap(&sync_engine)?; sync_engine.apply_changes_from_remote(coro, status).await?; Ok(None) @@ -306,7 +306,7 @@ impl SyncEngine { #[napi] pub fn checkpoint(&self) -> GeneratorHolder { self.run(async move |coro, guard| { - let sync_engine = try_read(&guard)?; + let sync_engine = try_read(guard)?; let sync_engine = try_unwrap(&sync_engine)?; sync_engine.checkpoint(coro).await?; Ok(None)