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

catalog shell: replace LoopState with ControlFlow

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-04-22 16:01:54 +02:00 committed by Dietmar Maurer
parent 0b6d9442bd
commit 5e58381ea9
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backup/catalog_shell.rs
View File

@ -19,9 +19,10 @@ use proxmox::tools::fs::{create_path, CreateOptions};
use pxar::{EntryKind, Metadata}; use pxar::{EntryKind, Metadata};
use crate::backup::catalog::{self, DirEntryAttribute}; use crate::backup::catalog::{self, DirEntryAttribute};
use crate::pxar::Flags;
use crate::pxar::fuse::{Accessor, FileEntry}; use crate::pxar::fuse::{Accessor, FileEntry};
use crate::pxar::Flags;
use crate::tools::runtime::block_in_place; use crate::tools::runtime::block_in_place;
use crate::tools::ControlFlow;
type CatalogReader = crate::backup::CatalogReader<std::fs::File>; type CatalogReader = crate::backup::CatalogReader<std::fs::File>;
@ -998,11 +999,6 @@ impl Shell {
} }
} }
enum LoopState {
Break,
Continue,
}
struct ExtractorState<'a> { struct ExtractorState<'a> {
path: Vec<u8>, path: Vec<u8>,
path_len: usize, path_len: usize,
@ -1060,8 +1056,8 @@ impl<'a> ExtractorState<'a> {
let entry = match self.read_dir.next() { let entry = match self.read_dir.next() {
Some(entry) => entry, Some(entry) => entry,
None => match self.handle_end_of_directory()? { None => match self.handle_end_of_directory()? {
LoopState::Break => break, // done with root directory ControlFlow::Break(()) => break, // done with root directory
LoopState::Continue => continue, ControlFlow::Continue(()) => continue,
}, },
}; };
@ -1079,11 +1075,11 @@ impl<'a> ExtractorState<'a> {
Ok(()) Ok(())
} }
fn handle_end_of_directory(&mut self) -> Result<LoopState, Error> { fn handle_end_of_directory(&mut self) -> Result<ControlFlow<()>, Error> {
// go up a directory: // go up a directory:
self.read_dir = match self.read_dir_stack.pop() { self.read_dir = match self.read_dir_stack.pop() {
Some(r) => r, Some(r) => r,
None => return Ok(LoopState::Break), // out of root directory None => return Ok(ControlFlow::Break(())), // out of root directory
}; };
self.matches = self self.matches = self
@ -1102,7 +1098,7 @@ impl<'a> ExtractorState<'a> {
self.extractor.leave_directory()?; self.extractor.leave_directory()?;
Ok(LoopState::Continue) Ok(ControlFlow::CONTINUE)
} }
async fn handle_new_directory( async fn handle_new_directory(