tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clippy: don't pass along unit value 

make it explicit. this whole section should probably be re-written with
select!

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-01-19 11:36:26 +01:00
parent 17c7b46a69
commit 3f48cdb380
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api2/reader.rs
View File

@ -150,16 +150,16 @@ fn upgrade_to_backup_reader_protocol(
} }
}); });
let abort_future = abort_future let abort_future = abort_future
.map(|_| Err(format_err!("task aborted"))); .map(|_| -> Result<(), anyhow::Error> { Err(format_err!("task aborted")) });
use futures::future::Either; use futures::future::Either;
futures::future::select(req_fut, abort_future) futures::future::select(req_fut, abort_future)
.map(move |res| { .map(move |res| {
let _guard = _guard; let _guard = _guard;
match res { match res {
Either::Left((Ok(res), _)) => Ok(res), Either::Left((Ok(_), _)) => Ok(()),
Either::Left((Err(err), _)) => Err(err), Either::Left((Err(err), _)) => Err(err),
Either::Right((Ok(res), _)) => Ok(res), Either::Right((Ok(_), _)) => Ok(()),
Either::Right((Err(err), _)) => Err(err), Either::Right((Err(err), _)) => Err(err),
} }
}) })