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 ADBF570CDF for ; Tue, 6 Apr 2021 08:28:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9C7EC29AEF for ; Tue, 6 Apr 2021 08:27:50 +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 1266329AB3 for ; Tue, 6 Apr 2021 08:27:49 +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 CF413459CE for ; Tue, 6 Apr 2021 08:27:48 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 6 Apr 2021 08:27:40 +0200 Message-Id: <20210406062747.9356-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210406062747.9356-1-d.csapak@proxmox.com> References: <20210406062747.9356-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.172 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: [pbs-devel] [PATCH proxmox-backup 05/12] 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: Tue, 06 Apr 2021 06:28:20 -0000 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 05aa52a4..0a79ef3c 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); + /// 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>>; + /// 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