fixup

Author: Frando

src/actor.rs

@@ -605,24 +605,27 @@ impl SyncHandle {
 
 impl Drop for SyncHandle {
     fn drop(&mut self) {
-        #[cfg(wasm_browser)]
-        {
-            let tx = self.tx.clone();
-            n0_future::task::spawn(async move {
-                tx.send(Action::Shutdown { reply: None }).await.ok();
-            });
-        }
         // this means we're dropping the last reference
-        #[cfg(not(wasm_browser))]
+        #[allow(unused)]
         if let Some(handle) = Arc::get_mut(&mut self.join_handle) {
-            // this call is the reason tx can not be a tokio mpsc channel.
-            // we have no control about where drop is called, yet tokio send_blocking panics
-            // when called from inside a tokio runtime.
-            self.tx.send_blocking(Action::Shutdown { reply: None }).ok();
-            let handle = handle.take().expect("this can only run once");
-
-            if let Err(err) = handle.join() {
-                warn!(?err, "Failed to join sync actor");
+            #[cfg(wasm_browser)]
+            {
+                let tx = self.tx.clone();
+                n0_future::task::spawn(async move {
+                    tx.send(Action::Shutdown { reply: None }).await.ok();
+                });
+            }
+            #[cfg(not(wasm_browser))]
+            {
+                // this call is the reason tx can not be a tokio mpsc channel.
+                // we have no control about where drop is called, yet tokio send_blocking panics
+                // when called from inside a tokio runtime.
+                self.tx.send_blocking(Action::Shutdown { reply: None }).ok();
+                let handle = handle.take().expect("this can only run once");
+
+                if let Err(err) = handle.join() {
+                    warn!(?err, "Failed to join sync actor");
+                }
             }
         }
     }

src/engine/gossip.rs

@@ -9,10 +9,8 @@ use iroh_gossip::{
     api::{Event, GossipReceiver, GossipSender, JoinOptions},
     net::Gossip,
 };
-use tokio::{
-    sync::mpsc,
-    task::{AbortHandle, JoinSet},
-};
+use n0_future::task::{AbortHandle, JoinSet};
+use tokio::sync::mpsc;
 use tracing::{debug, instrument, warn};
 
 use super::live::{Op, ToLiveActor};

src/engine/live.rs

@@ -19,12 +19,10 @@ use iroh_blobs::{
     Hash, HashAndFormat,
 };
 use iroh_gossip::net::Gossip;
+use n0_future::task::JoinSet;
 use n0_future::time::SystemTime;
 use serde::{Deserialize, Serialize};
-use tokio::{
-    sync::{self, mpsc, oneshot},
-    task::JoinSet,
-};
+use tokio::sync::{self, mpsc, oneshot};
 use tracing::{debug, error, info, instrument, trace, warn, Instrument, Span};
 
 // use super::gossip::{GossipActor, ToGossipActor};