diff --git a/src/clients/wayland/mod.rs b/src/clients/wayland/mod.rs index 729c55c4..5f09b25f 100644 --- a/src/clients/wayland/mod.rs +++ b/src/clients/wayland/mod.rs @@ -3,7 +3,7 @@ mod wl_output; mod wl_seat; use crate::error::ERR_CHANNEL_RECV; -use crate::{arc_mut, lock, register_client, send, Ironbar}; +use crate::{arc_mut, lock, register_client, send, spawn, spawn_blocking}; use std::sync::{Arc, Mutex}; use calloop_channel::Event::Msg; @@ -132,7 +132,7 @@ impl Client { #[cfg(feature = "clipboard")] let clipboard_channel = broadcast::channel(32); - Ironbar::runtime().spawn_blocking(move || { + spawn_blocking(move || { Environment::spawn(event_tx, request_rx, response_tx); }); @@ -145,8 +145,7 @@ impl Client { #[cfg(feature = "clipboard")] let clipboard_tx = clipboard_channel.0.clone(); - let rt = Ironbar::runtime(); - rt.spawn(async move { + spawn(async move { while let Some(event) = event_rx.recv().await { match event { Event::Output(event) => send!(output_tx, event), diff --git a/src/script.rs b/src/script.rs index 47683c10..71f0dc42 100644 --- a/src/script.rs +++ b/src/script.rs @@ -1,4 +1,4 @@ -use crate::send_async; +use crate::{send_async, spawn}; use color_eyre::eyre::WrapErr; use color_eyre::{Report, Result}; use serde::Deserialize; @@ -7,9 +7,9 @@ use std::fmt::{Display, Formatter}; use std::process::Stdio; use tokio::io::{AsyncBufReadExt, BufReader}; use tokio::process::Command; +use tokio::select; use tokio::sync::mpsc; use tokio::time::sleep; -use tokio::{select, spawn}; use tracing::{debug, error, trace, warn}; #[derive(Debug, Deserialize, Clone)]