tsarevvv/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove use of proxmox_lang::error::io_err_other

Browse Source 
by now its functionality is provided by std::io::Error::other

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2024-07-26 12:17:09 +02:00
parent 96b7812b6a
commit 3f325047dc
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pbs-datastore/src/cached_chunk_reader.rs
View File

@ -10,7 +10,6 @@ use anyhow::Error;
use futures::ready; use futures::ready;
use tokio::io::{AsyncRead, AsyncSeek, ReadBuf}; use tokio::io::{AsyncRead, AsyncSeek, ReadBuf};
use proxmox_lang::error::io_err_other;
use proxmox_lang::io_format_err; use proxmox_lang::io_format_err;
use pbs_tools::async_lru_cache::{AsyncCacher, AsyncLruCache}; use pbs_tools::async_lru_cache::{AsyncCacher, AsyncLruCache};
@ -182,7 +181,7 @@ where
this.position += read as u64; this.position += read as u64;
Ok(()) Ok(())
} }
Err(err) => Err(io_err_other(err)), Err(err) => Err(std::io::Error::other(err)),
}; };
// future completed, drop // future completed, drop

5
src/tools/disks/mod.rs
View File

@ -14,7 +14,6 @@ use once_cell::sync::OnceCell;
use ::serde::{Deserialize, Serialize}; use ::serde::{Deserialize, Serialize};
use proxmox_lang::error::io_err_other;
use proxmox_lang::{io_bail, io_format_err}; use proxmox_lang::{io_bail, io_format_err};
use proxmox_schema::api; use proxmox_schema::api;
use proxmox_sys::linux::procfs::{mountinfo::Device, MountInfo}; use proxmox_sys::linux::procfs::{mountinfo::Device, MountInfo};
@ -300,7 +299,7 @@ impl Disk {
/// Convenience wrapper for reading a `/sys` file which contains just a simple utf-8 string. /// Convenience wrapper for reading a `/sys` file which contains just a simple utf-8 string.
pub fn read_sys_str<P: AsRef<Path>>(&self, path: P) -> io::Result<Option<String>> { pub fn read_sys_str<P: AsRef<Path>>(&self, path: P) -> io::Result<Option<String>> {
Ok(match self.read_sys(path.as_ref())? { Ok(match self.read_sys(path.as_ref())? {
Some(data) => Some(String::from_utf8(data).map_err(io_err_other)?), Some(data) => Some(String::from_utf8(data).map_err(io::Error::other)?),
None => None, None => None,
}) })
} }
@ -308,7 +307,7 @@ impl Disk {
/// Convenience wrapper for unsigned integer `/sys` values up to 64 bit. /// Convenience wrapper for unsigned integer `/sys` values up to 64 bit.
pub fn read_sys_u64<P: AsRef<Path>>(&self, path: P) -> io::Result<Option<u64>> { pub fn read_sys_u64<P: AsRef<Path>>(&self, path: P) -> io::Result<Option<u64>> {
Ok(match self.read_sys_str(path)? { Ok(match self.read_sys_str(path)? {
Some(data) => Some(data.trim().parse().map_err(io_err_other)?), Some(data) => Some(data.trim().parse().map_err(io::Error::other)?),
None => None, None => None,
}) })
} }