remove pbs-tools::ops::ControlFlow

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/pbs-client/src/catalog_shell.rs b/pbs-client/src/catalog_shell.rs
index 6a35f135b6773767b6533b5c75e25892f244dbd9..16595b41406731e7015561b31fb10cb4d6fb9bda 100644 (file)
--- a/pbs-client/src/catalog_shell.rs
+++ b/pbs-client/src/catalog_shell.rs
@@ -3,6 +3,7 @@ use std::ffi::{CStr, CString, OsStr, OsString};
 use std::future::Future;
 use std::io::Write;
 use std::mem;
+use std::ops::ControlFlow;
 use std::os::unix::ffi::{OsStrExt, OsStringExt};
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
@@ -20,7 +21,6 @@ use pxar::{EntryKind, Metadata};
 
 use pbs_runtime::block_in_place;
 use pbs_datastore::catalog::{self, DirEntryAttribute};
-use pbs_tools::ops::ControlFlow;
 
 use crate::pxar::Flags;
 use crate::pxar::fuse::{Accessor, FileEntry};
@@ -1100,7 +1100,7 @@ impl<'a> ExtractorState<'a> {
 
         self.extractor.leave_directory()?;
 
-        Ok(ControlFlow::CONTINUE)
+        Ok(ControlFlow::Continue(()))
     }
 
     async fn handle_new_directory(

diff --git a/pbs-tools/src/lib.rs b/pbs-tools/src/lib.rs
index 6b7b600bd80c9785449e8b6251a1913f830590f5..8ac322dd78a6c353181c483aa41eb66574c97742 100644 (file)
--- a/pbs-tools/src/lib.rs
+++ b/pbs-tools/src/lib.rs
@@ -15,7 +15,6 @@ pub mod json;
 pub mod logrotate;
 pub mod lru_cache;
 pub mod nom;
-pub mod ops;
 pub mod percent_encoding;
 pub mod process_locker;
 pub mod sha;

diff --git a/pbs-tools/src/ops.rs b/pbs-tools/src/ops.rs
deleted file mode 100644 (file)
index 49d0212..0000000
--- a/pbs-tools/src/ops.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-//! std::ops extensions
-
-/// Modeled after the nightly `std::ops::ControlFlow`.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum ControlFlow<B, C = ()> {
-    Continue(C),
-    Break(B),
-}
-
-impl<B> ControlFlow<B> {
-    pub const CONTINUE: ControlFlow<B, ()> = ControlFlow::Continue(());
-}

diff --git a/src/api2/config/acme.rs b/src/api2/config/acme.rs
index efa0b57b254435865f6f02f9a315985091b45fd2..c24c785072f7123f3a4d46308876de2b8a243ca0 100644 (file)
--- a/src/api2/config/acme.rs
+++ b/src/api2/config/acme.rs
@@ -1,4 +1,5 @@
 use std::fs;
+use std::ops::ControlFlow;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 use std::time::SystemTime;
@@ -17,7 +18,6 @@ use proxmox_acme_rs::account::AccountData as AcmeAccountData;
 use proxmox_acme_rs::Account;
 
 use pbs_api_types::{Authid, PRIV_SYS_MODIFY};
-use pbs_tools::ops::ControlFlow;
 use pbs_tools::{task_log, task_warn};
 
 use crate::acme::AcmeClient;

diff --git a/src/config/acme/mod.rs b/src/config/acme/mod.rs
index 16dfff48fac509bf256cff44fd8e695e0c4aa5b2..861cb5797ba27d2ba42804f0b214ac4444910574 100644 (file)
--- a/src/config/acme/mod.rs
+++ b/src/config/acme/mod.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::ops::ControlFlow;
 use std::path::Path;
 
 use anyhow::{bail, format_err, Error};
@@ -14,7 +15,6 @@ use crate::api2::types::{
     KnownAcmeDirectory,
     AcmeAccountName,
 };
-use pbs_tools::ops::ControlFlow;
 
 pub(crate) const ACME_DIR: &str = pbs_buildcfg::configdir!("/acme");
 pub(crate) const ACME_ACCOUNT_DIR: &str = pbs_buildcfg::configdir!("/acme/accounts");
@@ -141,7 +141,7 @@ pub fn complete_acme_account(_arg: &str, _param: &HashMap<String, String>) -> Ve
     let mut out = Vec::new();
     let _ = foreach_acme_account(|name| {
         out.push(name.into_string());
-        ControlFlow::CONTINUE
+        ControlFlow::Continue(())
     });
     out
 }