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 A595374673 for ; Mon, 19 Apr 2021 10:49:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9D0F612683 for ; Mon, 19 Apr 2021 10:49:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 0945D12676 for ; Mon, 19 Apr 2021 10:49:20 +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 C478942DD3 for ; Mon, 19 Apr 2021 10:49:19 +0200 (CEST) Date: Mon, 19 Apr 2021 10:48:59 +0200 (CEST) From: Wolfgang Bumiller To: Proxmox Backup Server development discussion , Dominik Csapak Message-ID: <520736897.3861.1618822139084@webmail.proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.5-Rev5 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.032 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 proxmox-backup v2 05/14] tape/pool_writer: clippy fixes 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: Mon, 19 Apr 2021 08:49:20 -0000 > On 04/16/2021 12:29 PM Dominik Csapak wrote: > > > fixes: > * impl (or derive) Default for structs with `new()` > * put complex type in type definition > > Signed-off-by: Dominik Csapak > --- > src/tape/pool_writer/catalog_set.rs | 1 + > src/tape/pool_writer/mod.rs | 4 +++- > src/tape/pool_writer/new_chunks_iterator.rs | 4 +++- > 3 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/src/tape/pool_writer/catalog_set.rs b/src/tape/pool_writer/catalog_set.rs > index fbca3e97..b3630915 100644 > --- a/src/tape/pool_writer/catalog_set.rs > +++ b/src/tape/pool_writer/catalog_set.rs > @@ -12,6 +12,7 @@ use crate::{ > /// Helper to build and query sets of catalogs > /// > /// Similar to MediaSetCatalog, but allows to modify the last catalog. > +#[derive(Default)] > pub struct CatalogSet { > // read only part > pub media_set_catalog: MediaSetCatalog, > diff --git a/src/tape/pool_writer/mod.rs b/src/tape/pool_writer/mod.rs > index 99fdb48c..36c4dea0 100644 > --- a/src/tape/pool_writer/mod.rs > +++ b/src/tape/pool_writer/mod.rs > @@ -531,6 +531,8 @@ impl PoolWriter { > } > } > > +type WriteChunkArchiveResult = (Vec<[u8;32]>, Uuid, bool, usize); Urgh. Struct please.... Or, it's used exactly once, so maybe just #[clippy] this away and document on the function. But erm, structs don't hurt. (They really don't) > + > /// write up to of chunks > fn write_chunk_archive<'a>( > _worker: &WorkerTask, > @@ -538,7 +540,7 @@ fn write_chunk_archive<'a>( > chunk_iter: &mut std::iter::Peekable, > store: &str, > max_size: usize, > -) -> Result<(Vec<[u8;32]>, Uuid, bool, usize), Error> { > +) -> Result { > > let (mut writer, content_uuid) = ChunkArchiveWriter::new(writer, store, true)?; > > diff --git a/src/tape/pool_writer/new_chunks_iterator.rs b/src/tape/pool_writer/new_chunks_iterator.rs > index 56491356..55ea407d 100644 > --- a/src/tape/pool_writer/new_chunks_iterator.rs > +++ b/src/tape/pool_writer/new_chunks_iterator.rs > @@ -15,12 +15,14 @@ use crate::{ > }, > }; > > +type ChunkReceiver = std::sync::mpsc::Receiver, Error>>; One of these days I'll have change all those million `[u8; 32]` to a `Digest`. And make all the digest "methods" we now have free-standing in multiple crates real *methods*. > + > /// Chunk iterator which use a separate thread to read chunks > /// > /// The iterator skips duplicate chunks and chunks already in the > /// catalog. > pub struct NewChunksIterator { > - rx: std::sync::mpsc::Receiver, Error>>, > + rx: ChunkReceiver, > } > > impl NewChunksIterator { > -- > 2.20.1