Proxmox-Port/proxmox
1
0
Fork 0
forked from proxmox-mirrors/proxmox
Code Pull Requests Activity

sys: drop proxmox-borrow dependency

Browse Source 
nix now has an owning directory iterator, we don't need it
anymore

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2022-07-26 12:24:13 +02:00
parent 36625fb92c
commit 34d2c91118
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proxmox-sys/Cargo.toml
View File

@ -26,7 +26,6 @@ proxmox-sortable-macro = { path = "../proxmox-sortable-macro", optional = true,
proxmox-io = { path = "../proxmox-io", version = "1.0.0" } proxmox-io = { path = "../proxmox-io", version = "1.0.0" }
proxmox-lang = { path = "../proxmox-lang", version = "1.1" } proxmox-lang = { path = "../proxmox-lang", version = "1.1" }
proxmox-borrow = { path = "../proxmox-borrow", version = "1.0.0" }
proxmox-time = { path = "../proxmox-time", version = "1.0.0" } proxmox-time = { path = "../proxmox-time", version = "1.0.0" }
[features] [features]

9
proxmox-sys/src/fs/read_dir.rs
View File

@ -10,8 +10,6 @@ use nix::sys::stat::Mode;
use regex::Regex; use regex::Regex;
use proxmox_borrow::Tied;
#[cfg(feature = "timer")] #[cfg(feature = "timer")]
use crate::error::SysError; use crate::error::SysError;
@ -89,7 +87,7 @@ impl ReadDirEntry {
// This is simply a wrapper with a shorter type name mapping nix::Error to anyhow::Error. // This is simply a wrapper with a shorter type name mapping nix::Error to anyhow::Error.
/// Wrapper over a pair of `nix::dir::Dir` and `nix::dir::Iter`, returned by `read_subdir()`. /// Wrapper over a pair of `nix::dir::Dir` and `nix::dir::Iter`, returned by `read_subdir()`.
pub struct ReadDir { pub struct ReadDir {
iter: Tied<Dir, dyn Iterator<Item = nix::Result<dir::Entry>> + Send>, iter: nix::dir::OwningIter,
dir_fd: RawFd, dir_fd: RawFd,
} }
@ -112,10 +110,7 @@ impl Iterator for ReadDir {
pub fn read_subdir<P: ?Sized + nix::NixPath>(dirfd: RawFd, path: &P) -> nix::Result<ReadDir> { pub fn read_subdir<P: ?Sized + nix::NixPath>(dirfd: RawFd, path: &P) -> nix::Result<ReadDir> {
let dir = Dir::openat(dirfd, path, OFlag::O_RDONLY, Mode::empty())?; let dir = Dir::openat(dirfd, path, OFlag::O_RDONLY, Mode::empty())?;
let fd = dir.as_raw_fd(); let fd = dir.as_raw_fd();
let iter = Tied::new(dir, |dir| { let iter = dir.into_iter();
Box::new(unsafe { (*dir).iter() })
as Box<dyn Iterator<Item = nix::Result<dir::Entry>> + Send>
});
Ok(ReadDir { iter, dir_fd: fd }) Ok(ReadDir { iter, dir_fd: fd })
} }