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

clippy: use while let loops

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-01-19 14:52:20 +01:00
parent 09faa9ee95
commit 0d2133db98
2 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/api2/tape/restore.rs
View File

@ -343,32 +343,26 @@ fn restore_chunk_archive<'a>(
let mut decoder = ChunkArchiveDecoder::new(reader); let mut decoder = ChunkArchiveDecoder::new(reader);
let result: Result<_, Error> = proxmox::try_block!({ let result: Result<_, Error> = proxmox::try_block!({
loop { while let Some((digest, blob)) = decoder.next_chunk()? {
match decoder.next_chunk()? { if let Some(datastore) = datastore {
Some((digest, blob)) => { let chunk_exists = datastore.cond_touch_chunk(&digest, false)?;
if !chunk_exists {
blob.verify_crc()?;
if let Some(datastore) = datastore { if blob.crypt_mode()? == CryptMode::None {
let chunk_exists = datastore.cond_touch_chunk(&digest, false)?; blob.decode(None, Some(&digest))?; // verify digest
if !chunk_exists {
blob.verify_crc()?;
if blob.crypt_mode()? == CryptMode::None {
blob.decode(None, Some(&digest))?; // verify digest
}
if verbose {
worker.log(format!("Insert chunk: {}", proxmox::tools::digest_to_hex(&digest)));
}
datastore.insert_chunk(&blob, &digest)?;
} else if verbose {
worker.log(format!("Found existing chunk: {}", proxmox::tools::digest_to_hex(&digest)));
}
} else if verbose {
worker.log(format!("Found chunk: {}", proxmox::tools::digest_to_hex(&digest)));
} }
chunks.push(digest); if verbose {
worker.log(format!("Insert chunk: {}", proxmox::tools::digest_to_hex(&digest)));
}
datastore.insert_chunk(&blob, &digest)?;
} else if verbose {
worker.log(format!("Found existing chunk: {}", proxmox::tools::digest_to_hex(&digest)));
} }
None => break, } else if verbose {
worker.log(format!("Found chunk: {}", proxmox::tools::digest_to_hex(&digest)));
} }
chunks.push(digest);
} }
Ok(()) Ok(())
}); });

6
src/tools/parallel_handler.rs
View File

@ -134,11 +134,7 @@ impl<I: Send + 'static> ParallelHandler<I> {
let mut msg_list = Vec::new(); let mut msg_list = Vec::new();
let mut i = 0; let mut i = 0;
loop { while let Some(handle) = self.handles.pop() {
let handle = match self.handles.pop() {
Some(handle) => handle,
None => break,
};
if let Err(panic) = handle.join() { if let Err(panic) = handle.join() {
match panic.downcast::<&str>() { match panic.downcast::<&str>() {
Ok(panic_msg) => msg_list.push( Ok(panic_msg) => msg_list.push(