From d786ea10526be1e74a6576d4280ef5c2e8e71f4c Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Tue, 25 Jul 2023 21:57:45 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Passes=20fm?=
 =?UTF-8?q?t=20and=20clippy=20checks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagetop-minimal/src/component/poweredby.rs | 5 +----
 pagetop-minimal/src/lib.rs                 | 3 +--
 pagetop/src/core/component/pack.rs         | 6 ++----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pagetop-minimal/src/component/poweredby.rs b/pagetop-minimal/src/component/poweredby.rs
index e50f3b3c..0328a06c 100644
--- a/pagetop-minimal/src/component/poweredby.rs
+++ b/pagetop-minimal/src/component/poweredby.rs
@@ -101,10 +101,7 @@ impl PoweredBy {
 
     #[fn_builder]
     pub fn alter_copyright(&mut self, copyright: Option<impl Into<String>>) -> &mut Self {
-        self.copyright = match copyright {
-            Some(c) => Some(c.into()),
-            _ => None,
-        };
+        self.copyright = copyright.map(|c| c.into());
         self
     }
 
diff --git a/pagetop-minimal/src/lib.rs b/pagetop-minimal/src/lib.rs
index 37ecd1a4..5be4cc75 100644
--- a/pagetop-minimal/src/lib.rs
+++ b/pagetop-minimal/src/lib.rs
@@ -48,8 +48,7 @@ impl Minimal {
 fn after_prepare_body(page: &mut Page) {
     if let Some(true) = page.context().get_param::<bool>(PARAM_MINIMAL_ASSETS) {
         page.context().alter(ContextOp::AddStyleSheet(
-            StyleSheet::at("/minimal/css/minimal.css")
-                .with_version(VERSION_MINIMAL)
+            StyleSheet::at("/minimal/css/minimal.css").with_version(VERSION_MINIMAL),
         ));
     }
 }
diff --git a/pagetop/src/core/component/pack.rs b/pagetop/src/core/component/pack.rs
index 9fe79e40..be3540ff 100644
--- a/pagetop/src/core/component/pack.rs
+++ b/pagetop/src/core/component/pack.rs
@@ -55,10 +55,8 @@ impl PackComponents {
 
     pub(crate) fn merge(packs: &[Option<&PackComponents>]) -> Self {
         let mut pack = PackComponents::default();
-        for p in packs {
-            if let Some(p) = p {
-                pack.0.append(&mut p.0.clone());
-            }
+        for p in packs.iter().flatten() {
+            pack.0.append(&mut p.0.clone());
         }
         pack
     }