Construct BinstallError from JoinError in main

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-07-21 20:43:47 +10:00
parent 6e5ecc46cf
commit d39bc0acab
No known key found for this signature in database
GPG key ID: 591C0B03040416D6

View file

@ -172,13 +172,16 @@ fn main() -> MainExit {
let done = start.elapsed();
debug!("run time: {done:?}");
result.map_or_else(MainExit::JoinErr, |res| {
res.map(|_| MainExit::Success(done)).unwrap_or_else(|err| {
err.downcast::<BinstallError>()
.map(MainExit::Error)
.unwrap_or_else(MainExit::Report)
})
})
result.map_or_else(
|join_err| MainExit::Error(BinstallError::from(join_err)),
|res| {
res.map(|_| MainExit::Success(done)).unwrap_or_else(|err| {
err.downcast::<BinstallError>()
.map(MainExit::Error)
.unwrap_or_else(MainExit::Report)
})
},
)
}
async fn entry(jobserver_client: LazyJobserverClient) -> Result<()> {