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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7F68990ECE for ; Tue, 13 Feb 2024 11:27:17 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6157B34499 for ; Tue, 13 Feb 2024 11:26:47 +0100 (CET) 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, 13 Feb 2024 11:26:45 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A773F47B8E for ; Tue, 13 Feb 2024 11:26:45 +0100 (CET) Date: Tue, 13 Feb 2024 11:26:38 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240213095320.186188-1-m.sandoval@proxmox.com> <20240213095320.186188-4-m.sandoval@proxmox.com> In-Reply-To: <20240213095320.186188-4-m.sandoval@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1707819653.575de1h3gk.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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 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. [proxmox.com, user.rs] Subject: Re: [pbs-devel] [PATCH backup 4/4] api: use if-let pattern for error-only handling 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, 13 Feb 2024 10:27:17 -0000 On February 13, 2024 10:53 am, Maximiliano Sandoval wrote: > It is more readable than using match. We also inline variables in > eprintln!. what about the exact same pattern directly above it? there's like 10 more places to look at based on simple grepping.. >=20 > Signed-off-by: Maximiliano Sandoval > --- > src/api2/access/user.rs | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) >=20 > diff --git a/src/api2/access/user.rs b/src/api2/access/user.rs > index 118838ce..035c8a57 100644 > --- a/src/api2/access/user.rs > +++ b/src/api2/access/user.rs > @@ -391,18 +391,12 @@ pub fn delete_user(userid: Userid, digest: Option) -> Result<(), Error> > } > } > =20 > - match crate::config::tfa::read().and_then(|mut cfg| { > + if let Err(err) =3D crate::config::tfa::read().and_then(|mut cfg| { > let _: proxmox_tfa::api::NeedsSaving =3D > cfg.remove_user(&crate::config::tfa::UserAccess, userid.as_s= tr())?; > crate::config::tfa::write(&cfg) > }) { > - Ok(()) =3D> (), > - Err(err) =3D> { > - eprintln!( > - "error updating TFA config after deleting user {:?}: {}"= , > - userid, err > - ); > - } > + eprintln!("error updating TFA config after deleting user {userid= :?} {err}",); > } > =20 > Ok(()) > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20