actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-21 04:58:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor MultiFetcher.first_available

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-06-07 15:35:21 +10:00
parent c393270899
commit 3d6679fd7d
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/fetchers.rs
View file

@ -63,16 +63,7 @@ impl MultiFetcher {
let fetcher_cloned = fetcher.clone(); let fetcher_cloned = fetcher.clone();
( (
AutoAbortJoinHandle(tokio::spawn(async move { AutoAbortJoinHandle(tokio::spawn(async move { fetcher.check().await })),
fetcher.check().await.unwrap_or_else(|err| {
debug!(
"Error while checking fetcher {}: {}",
fetcher.source_name(),
err
);
false
})
})),
fetcher_cloned, fetcher_cloned,
) )
}) })
@ -80,7 +71,15 @@ impl MultiFetcher {
for (mut handle, fetcher) in handles { for (mut handle, fetcher) in handles {
match (&mut handle.0).await { match (&mut handle.0).await {
Ok(true) => return Some(fetcher), Ok(Ok(true)) => return Some(fetcher),
Ok(Ok(false)) => (),
Ok(Err(err)) => {
debug!(
"Error while checking fetcher {}: {}",
fetcher.source_name(),
err
);
}
Err(join_err) => { Err(join_err) => {
debug!( debug!(
"Error while checking fetcher {}: {}", "Error while checking fetcher {}: {}",
@ -88,7 +87,6 @@ impl MultiFetcher {
join_err join_err
); );
} }
_ => (),
} }
} }
@ -97,7 +95,7 @@ impl MultiFetcher {
} }
#[derive(Debug)] #[derive(Debug)]
struct AutoAbortJoinHandle(JoinHandle<bool>); struct AutoAbortJoinHandle(JoinHandle<Result<bool, BinstallError>>);
impl Drop for AutoAbortJoinHandle { impl Drop for AutoAbortJoinHandle {
fn drop(&mut self) { fn drop(&mut self) {