From 3320d8024867859ae00ccbb7503b0aafd103938c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= Date: Wed, 29 Jan 2025 11:56:51 +0100 Subject: [PATCH] Fix rebase --- iroh/src/magicsock.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iroh/src/magicsock.rs b/iroh/src/magicsock.rs index b8d80a2a3e..6d94d8f81a 100644 --- a/iroh/src/magicsock.rs +++ b/iroh/src/magicsock.rs @@ -2170,17 +2170,17 @@ impl Actor { #[cfg(not(wasm_browser))] let portmap_watcher_changed = portmap_watcher.changed(); #[cfg(wasm_browser)] - let portmap_watcher_changed = futures_lite::future::pending(); + let portmap_watcher_changed = n0_future::future::pending(); #[cfg(not(wasm_browser))] let direct_addr_heartbeat_timer_tick = direct_addr_heartbeat_timer.tick(); #[cfg(wasm_browser)] - let direct_addr_heartbeat_timer_tick = futures_lite::future::pending(); + let direct_addr_heartbeat_timer_tick = n0_future::future::pending(); #[cfg(not(wasm_browser))] let link_change_r_recv = link_change_r.recv(); #[cfg(wasm_browser)] - let link_change_r_recv = futures_lite::future::pending(); + let link_change_r_recv = n0_future::future::pending(); tokio::select! { msg = self.msg_receiver.recv(), if !receiver_closed => {