From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 60C8489C3 for ; Tue, 22 Aug 2023 13:35:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 487F8BAC4 for ; Tue, 22 Aug 2023 13:35:27 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 22 Aug 2023 13:35:26 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 88897432FD for ; Tue, 22 Aug 2023 13:35:26 +0200 (CEST) Date: Tue, 22 Aug 2023 13:35:25 +0200 From: Wolfgang Bumiller To: Max Carrara Cc: pbs-devel@lists.proxmox.com Message-ID: References: <20230811095600.288467-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230811095600.288467-1-m.carrara@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.103 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 Subject: Re: [pbs-devel] [PATCH pxar] decoder: sync: remove needless wrapper around `decoder::Contents` 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: , X-List-Received-Date: Tue, 22 Aug 2023 11:35:27 -0000 sorry for the late reply NAK On Fri, Aug 11, 2023 at 11:56:00AM +0200, Max Carrara wrote: > Similarly to the `impl` for `tokio::io::AsyncRead` in `decoder::aio`, > this implements the `std::io::Read` trait on `decoder::Contents` > directly while removing the wrapper. > > This allows `decoder::Contents` to be used in both synchronous > and asynchronous contexts. > > Signed-off-by: Max Carrara > --- > src/decoder/sync.rs | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/src/decoder/sync.rs b/src/decoder/sync.rs > index 5597a03..be576f8 100644 > --- a/src/decoder/sync.rs > +++ b/src/decoder/sync.rs > @@ -5,7 +5,7 @@ use std::path::Path; > use std::pin::Pin; > use std::task::{Context, Poll}; > > -use crate::decoder::{self, SeqRead}; > +use crate::decoder::{self, Contents, SeqRead}; > use crate::util::poll_result_once; > use crate::Entry; > > @@ -69,7 +69,7 @@ impl Decoder { > > /// Get a reader for the contents of the current entry, if the entry has contents. > pub fn contents(&mut self) -> Option> { > - self.inner.content_reader().map(|inner| Contents { inner }) > + self.inner.content_reader() > } > > /// Get the size of the current contents, if the entry has contents. > @@ -118,13 +118,8 @@ impl SeqRead for StandardReader { > } > } > > -/// Reader for file contents inside a pxar archive. > -pub struct Contents<'a, T: SeqRead> { > - inner: decoder::Contents<'a, T>, > -} > - > -impl<'a, T: SeqRead> io::Read for Contents<'a, T> { > +impl<'a, T: SeqRead> io::Read for decoder::Contents<'a, T> { `Read` is a sync interface and `poll_result_once()` *requires* it to actually return `Ready`, and panics otherwise. This is only allowed (and therefore "guaranteed" to work) when coming from the `sync` submodule, so only *its* readers should implement it. If anything, I'd go the other way round, take `pxar::decoder::Contents` private and have one in `aio` (or just ... reexport it there :P) > fn read(&mut self, buf: &mut [u8]) -> io::Result { > - poll_result_once(super::seq_read(&mut self.inner, buf)) > + poll_result_once(super::seq_read(self.input, buf)) > } > } > -- > 2.39.2