public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion
	<pbs-devel@lists.proxmox.com>
Subject: [pbs-devel] applied-seires: [PATCH proxmox 10/10] apt: repositories: remove unnecessary if-let in iterator
Date: Tue, 03 Dec 2024 14:30:25 +0100	[thread overview]
Message-ID: <1733232457.rekyvwiyvg.astroid@yuna.none> (raw)
In-Reply-To: <20241203102038.166031-10-m.sandoval@proxmox.com>

with a small follow-up folded into this patch, using `into_values()` instead of `values().copied()`

On December 3, 2024 11:20 am, Maximiliano Sandoval wrote:
> Fixes the manual_flatten clippy lint:
> 
> ```
> warning: unnecessary `if let` since only the `Some` variant of the iterator element is used
>   --> proxmox-apt/src/repositories/mod.rs:40:5
>    |
> 40 |       for digest in digests.values() {
>    |       ^             ---------------- help: try: `digests.values().copied().flatten()`
>    |  _____|
>    | |
> 41 | |         if let Some(digest) = digest {
> 42 | |             common_raw.extend_from_slice(&digest[..]);
> 43 | |         }
> 44 | |     }
>    | |_____^
>    |
> help: ...and remove the `if let` statement in the for loop
>   --> proxmox-apt/src/repositories/mod.rs:41:9
>    |
> 41 | /         if let Some(digest) = digest {
> 42 | |             common_raw.extend_from_slice(&digest[..]);
> 43 | |         }
>    | |_________^
>    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_flatten
>    = note: `#[warn(clippy::manual_flatten)]` on by default
> ```
> 
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
> ---
>  proxmox-apt/src/repositories/mod.rs | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/proxmox-apt/src/repositories/mod.rs b/proxmox-apt/src/repositories/mod.rs
> index 4c954668..b688f66e 100644
> --- a/proxmox-apt/src/repositories/mod.rs
> +++ b/proxmox-apt/src/repositories/mod.rs
> @@ -37,10 +37,8 @@ fn common_digest(files: &[APTRepositoryFile]) -> ConfigDigest {
>      }
>  
>      let mut common_raw = Vec::<u8>::with_capacity(digests.len() * 32);
> -    for digest in digests.values() {
> -        if let Some(digest) = digest {
> -            common_raw.extend_from_slice(&digest[..]);
> -        }
> +    for digest in digests.values().copied().flatten() {
> +        common_raw.extend_from_slice(&digest[..]);
>      }
>  
>      ConfigDigest::from_slice(&common_raw[..])
> -- 
> 2.39.5
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
> 


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel


      reply	other threads:[~2024-12-03 13:30 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-03 10:20 [pbs-devel] [PATCH proxmox 01/10] apt: file: Use unwrap_or_default instead of match Maximiliano Sandoval
2024-12-03 10:20 ` [pbs-devel] [PATCH proxmox 02/10] api: webhook: doc: add indentation to list item Maximiliano Sandoval
2024-12-03 10:20 ` [pbs-devel] [PATCH proxmox 03/10] apt: repositories: use if-let instead of match for Option Maximiliano Sandoval
2024-12-03 10:20 ` [pbs-devel] [PATCH proxmox 04/10] router: parsing: docs: fix Records::from link Maximiliano Sandoval
2024-12-03 10:20 ` [pbs-devel] [PATCH proxmox 05/10] router: parsing: docs: fix 'instead' typo Maximiliano Sandoval
2024-12-03 10:20 ` [pbs-devel] [PATCH proxmox 06/10] elide lifetimes where possible Maximiliano Sandoval
2024-12-03 10:20 ` [pbs-devel] [PATCH proxmox 07/10] remove unnecessary return statement Maximiliano Sandoval
2024-12-03 10:20 ` [pbs-devel] [PATCH proxmox 08/10] docs: remove empty lines in docs Maximiliano Sandoval
2024-12-03 10:20 ` [pbs-devel] [PATCH proxmox 09/10] sys: systemd: remove empty line after outer attribute Maximiliano Sandoval
2024-12-03 10:20 ` [pbs-devel] [PATCH proxmox 10/10] apt: repositories: remove unnecessary if-let in iterator Maximiliano Sandoval
2024-12-03 13:30   ` Fabian Grünbichler [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1733232457.rekyvwiyvg.astroid@yuna.none \
    --to=f.gruenbichler@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal