StNicolay/pass_manager
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Replaced try_join func by tokio::try_join to be consistent with delete_all

Browse Source
This commit is contained in:
StNicolay 2023-07-20 23:58:29 +03:00
parent 59a11ee37b
commit 6ebfe4e03f
Signed by: StNicolay
GPG Key ID: 9693D04DCD962B0D
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/state/get_user.rs
View File

@ -1,5 +1,4 @@
use crate::prelude::*; use crate::prelude::*;
use futures::future::try_join;
use itertools::Itertools; use itertools::Itertools;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use std::{fmt::Write, path::Path}; use std::{fmt::Write, path::Path};
@ -7,7 +6,7 @@ use teloxide::{
net::Download, net::Download,
types::{Document, FileMeta}, types::{Document, FileMeta},
}; };
use tokio::task::spawn_blocking; use tokio::{task::spawn_blocking, try_join};
use trim_in_place::TrimInPlace; use trim_in_place::TrimInPlace;
#[inline] #[inline]
@ -173,7 +172,7 @@ pub async fn get_user(
.map_err(Into::into) .map_err(Into::into)
}; };
let (data, existing_names) = try_join(download_file(&bot, file), existing_names).await?; let (data, existing_names) = try_join!(download_file(&bot, file), existing_names)?;
let user = match spawn_blocking(move || user_from_vec(data, existing_names)).await? { let user = match spawn_blocking(move || user_from_vec(data, existing_names)).await? {
Ok(Ok(user)) => user, Ok(Ok(user)) => user,