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 DBF3E7A82D; Tue, 5 Jul 2022 13:47:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CC1052E836; Tue, 5 Jul 2022 13:47: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; Tue, 5 Jul 2022 13:47:27 +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 18AEF40F53; Tue, 5 Jul 2022 13:47:27 +0200 (CEST) Date: Tue, 5 Jul 2022 13:47:26 +0200 From: Wolfgang Bumiller To: Dominik Csapak Cc: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Message-ID: <20220705114726.wbobjpgwroaj44a4@casey.proxmox.com> References: <20220531111726.2972022-1-d.csapak@proxmox.com> <20220531111726.2972022-2-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220531111726.2972022-2-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.294 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [zstd.rs] Subject: [pve-devel] applied-both: [PATCH proxmox 1/2] proxmox-compression: make ZstdEncoder stream a bit more generic X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2022 11:47:57 -0000 applied both patches for proxmox-compression & bumped On Tue, May 31, 2022 at 01:17:20PM +0200, Dominik Csapak wrote: > by not requiring the 'anyhow::Error' type from the source, but only > that it implements 'Into'. This way, we can also accept a stream > that produces e.g. an io::Error > > Signed-off-by: Dominik Csapak > --- > proxmox-compression/src/zstd.rs | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/proxmox-compression/src/zstd.rs b/proxmox-compression/src/zstd.rs > index d9e5826..3d4b2ab 100644 > --- a/proxmox-compression/src/zstd.rs > +++ b/proxmox-compression/src/zstd.rs > @@ -32,10 +32,11 @@ pub struct ZstdEncoder<'a, T> { > state: EncoderState, > } > > -impl<'a, T, O> ZstdEncoder<'a, T> > +impl<'a, T, O, E> ZstdEncoder<'a, T> > where > - T: Stream> + Unpin, > + T: Stream> + Unpin, > O: Into, > + E: Into, > { > /// Returns a new [ZstdEncoder] with default level 3 > pub fn new(inner: T) -> Result { > @@ -79,10 +80,11 @@ impl<'a, T> ZstdEncoder<'a, T> { > } > } > > -impl<'a, T, O> Stream for ZstdEncoder<'a, T> > +impl<'a, T, O, E> Stream for ZstdEncoder<'a, T> > where > - T: Stream> + Unpin, > + T: Stream> + Unpin, > O: Into, > + E: Into, > { > type Item = Result; > > @@ -93,7 +95,10 @@ where > match this.state { > EncoderState::Reading => { > if let Some(res) = ready!(Pin::new(&mut this.inner).poll_next(cx)) { > - let buf = res?; > + let buf = match res { > + Ok(buf) => buf, > + Err(err) => return Poll::Ready(Some(Err(err.into()))), > + }; > this.input_buffer = buf.into(); > this.state = EncoderState::Writing; > } else { > -- > 2.30.2