From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id F33EB1FF37F for ; Tue, 18 Jun 2024 16:22:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4E7431CA4F; Tue, 18 Jun 2024 16:22:13 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Tue, 18 Jun 2024 16:22:01 +0200 Message-ID: <20240618142207.331674-3-g.goller@proxmox.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240618142207.331674-1-g.goller@proxmox.com> References: <20240618142207.331674-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.055 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup v4 2/4] pxar: remove ArchiveError X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" The sole purpose of the ArchiveError was to add the file-path to the error. Using anyhow::Error we can add this information using the context and don't need this struct anymore. Signed-off-by: Gabriel Goller --- pbs-client/src/pxar/create.rs | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index 9a41bf3e..c9a8c744 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -1,6 +1,5 @@ use std::collections::{HashMap, HashSet}; use std::ffi::{CStr, CString, OsStr}; -use std::fmt; use std::io::{self, Read}; use std::mem::size_of; use std::ops::Range; @@ -117,25 +116,11 @@ pub fn is_virtual_file_system(magic: i64) -> bool { SYSFS_MAGIC) } -#[derive(Debug)] -struct ArchiveError { - path: PathBuf, - error: Error, } -impl ArchiveError { - fn new(path: PathBuf, error: Error) -> Self { - Self { path, error } } } -impl std::error::Error for ArchiveError {} - -impl fmt::Display for ArchiveError { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "error at {:?}: {}", self.path, self.error) - } -} #[derive(Eq, PartialEq, Hash)] pub(crate) struct HardLinkInfo { @@ -353,14 +338,6 @@ impl Archiver { self.feature_flags & self.fs_feature_flags } - fn wrap_err(&self, err: Error) -> Error { - if err.downcast_ref::().is_some() { - err - } else { - ArchiveError::new(self.path.clone(), err).into() - } - } - fn archive_dir_contents<'a, T: SeqWrite + Send>( &'a mut self, encoder: &'a mut Encoder<'_, T>, @@ -409,7 +386,7 @@ impl Archiver { &file_entry.stat, ) .await - .map_err(|err| self.wrap_err(err))?; + .context(format!("error at {:?}", self.path))?; } self.path = old_path; self.entry_counter = entry_counter; -- 2.43.0 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel