leyoda/pop-launcher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Favor futures crate over futures-lite to reduce dependencies

Browse source
This commit is contained in:
Michael Aaron Murphy 2022-03-27 16:54:26 +02:00 • committed by Michael Murphy
parent b770b59e7b
commit 4153f9f060
18 changed files with 116 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/src/scripts/mod.rs
View file

@ -5,7 +5,7 @@ use crate::*;
use pop_launcher::*;
use flume::Sender;
use futures_lite::{AsyncBufReadExt, StreamExt};
use futures::{AsyncBufReadExt, StreamExt};
use smol::process::{Command, Stdio};
use std::collections::VecDeque;
use std::{
@ -98,7 +98,7 @@ impl App {
}
};
futures_lite::future::zip(script_sender, script_receiver).await;
futures::future::join(script_sender, script_receiver).await;
}
async fn search(&mut self, query: &str) {
@ -158,7 +158,7 @@ async fn load_from(path: &Path, paths: &mut VecDeque<PathBuf>, tx: Sender<Script
smol::spawn(async move {
let mut file = match smol::fs::File::open(&path).await {
Ok(file) => smol::io::BufReader::new(file).lines(),
Ok(file) => futures::io::BufReader::new(file).lines(),
Err(why) => {
tracing::error!("cannot open script at {}: {}", path.display(), why);
return;