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 9FADFAC0F for ; Tue, 8 Aug 2023 10:02:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6C5B1686B for ; Tue, 8 Aug 2023 10:02:07 +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, 8 Aug 2023 10:02:05 +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 C3F494369B for ; Tue, 8 Aug 2023 10:02:04 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Tue, 8 Aug 2023 10:01:45 +0200 Message-Id: <20230808080153.79587-7-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230808080153.79587-1-l.wagner@proxmox.com> References: <20230808080153.79587-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.039 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: [pbs-devel] [PATCH proxmox 07/15] clippy fix: this (Default) `impl` can be derived 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, 08 Aug 2023 08:02:09 -0000 Signed-off-by: Lukas Wagner --- proxmox-api-macro/src/util.rs | 9 ++------- proxmox-subscription/src/subscription_info.rs | 9 +++------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/proxmox-api-macro/src/util.rs b/proxmox-api-macro/src/util.rs index 1eba31f..b90f303 100644 --- a/proxmox-api-macro/src/util.rs +++ b/proxmox-api-macro/src/util.rs @@ -623,19 +623,14 @@ where } /// Helper to distinguish between explicitly set or derived data. -#[derive(Clone, Copy, Eq, PartialEq)] +#[derive(Clone, Copy, Default, Eq, PartialEq)] pub enum Maybe { Explicit(T), Derived(T), + #[default] None, } -impl Default for Maybe { - fn default() -> Self { - Maybe::None - } -} - impl Maybe { pub fn as_ref(&self) -> Maybe<&T> { match self { diff --git a/proxmox-subscription/src/subscription_info.rs b/proxmox-subscription/src/subscription_info.rs index 8c0bd3e..f455392 100644 --- a/proxmox-subscription/src/subscription_info.rs +++ b/proxmox-subscription/src/subscription_info.rs @@ -20,7 +20,7 @@ pub(crate) const SUBSCRIPTION_MAX_KEY_CHECK_FAILURE_AGE: i64 = 5 * 24 * 3600; // Aliases are needed for PVE compat! #[cfg_attr(feature = "api-types", api())] -#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)] +#[derive(Default, Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)] #[serde(rename_all = "lowercase")] /// Subscription status pub enum SubscriptionStatus { @@ -29,6 +29,7 @@ pub enum SubscriptionStatus { #[serde(alias = "New")] New, /// no subscription set + #[default] #[serde(alias = "NotFound")] NotFound, /// subscription set and active @@ -44,11 +45,7 @@ pub enum SubscriptionStatus { #[serde(alias = "Suspended")] Suspended, } -impl Default for SubscriptionStatus { - fn default() -> Self { - SubscriptionStatus::NotFound - } -} + impl std::fmt::Display for SubscriptionStatus { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { -- 2.39.2