From 221b4dfa51e0383dec3262e773d70ab131e9d7c4 Mon Sep 17 00:00:00 2001
From: Julius Lungys <32368314+voidpumpkin@users.noreply.github.com>
Date: Sat, 5 Mar 2022 21:53:19 +0200
Subject: [PATCH] fix clippy (#2492)

---
 examples/boids/src/slider.rs                |  2 +-
 examples/futures/src/markdown.rs            | 17 +++--------------
 packages/yew/src/virtual_dom/listeners.rs   | 12 ++++--------
 tools/process-benchmark-results/src/main.rs |  2 +-
 tools/website-test/build.rs                 |  2 +-
 5 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/examples/boids/src/slider.rs b/examples/boids/src/slider.rs
index c5126352353..87f590531b9 100644
--- a/examples/boids/src/slider.rs
+++ b/examples/boids/src/slider.rs
@@ -54,7 +54,7 @@ impl Component for Slider {
             step,
         } = *ctx.props();
 
-        let precision = precision.unwrap_or_else(|| if percentage { 1 } else { 0 });
+        let precision = precision.unwrap_or(if percentage { 1 } else { 0 });
 
         let display_value = if percentage {
             format!("{:.p$}%", 100.0 * value, p = precision)
diff --git a/examples/futures/src/markdown.rs b/examples/futures/src/markdown.rs
index 84de7c8ce11..4f105fa585b 100644
--- a/examples/futures/src/markdown.rs
+++ b/examples/futures/src/markdown.rs
@@ -53,18 +53,12 @@ pub fn render_markdown(src: &str) -> Html {
                     pre.add_child(top.into());
                     top = pre;
                 } else if let Tag::Table(aligns) = tag {
-                    for r in top
-                        .children_mut()
-                        .iter_mut()
-                        .map(|ch| ch.iter_mut())
-                        .flatten()
-                    {
+                    for r in top.children_mut().iter_mut().flat_map(|ch| ch.iter_mut()) {
                         if let VNode::VTag(ref mut vtag) = r {
                             for (i, c) in vtag
                                 .children_mut()
                                 .iter_mut()
-                                .map(|ch| ch.iter_mut())
-                                .flatten()
+                                .flat_map(|ch| ch.iter_mut())
                                 .enumerate()
                             {
                                 if let VNode::VTag(ref mut vtag) = c {
@@ -79,12 +73,7 @@ pub fn render_markdown(src: &str) -> Html {
                         }
                     }
                 } else if let Tag::TableHead = tag {
-                    for c in top
-                        .children_mut()
-                        .iter_mut()
-                        .map(|ch| ch.iter_mut())
-                        .flatten()
-                    {
+                    for c in top.children_mut().iter_mut().flat_map(|ch| ch.iter_mut()) {
                         if let VNode::VTag(ref mut vtag) = c {
                             // TODO
                             //                            vtag.tag = "th".into();
diff --git a/packages/yew/src/virtual_dom/listeners.rs b/packages/yew/src/virtual_dom/listeners.rs
index 4473659dadf..29c0db7adf4 100644
--- a/packages/yew/src/virtual_dom/listeners.rs
+++ b/packages/yew/src/virtual_dom/listeners.rs
@@ -478,8 +478,7 @@ impl Registry {
     fn handle(desc: EventDescriptor, event: Event) {
         let target = match event
             .target()
-            .map(|el| el.dyn_into::<web_sys::Element>().ok())
-            .flatten()
+            .and_then(|el| el.dyn_into::<web_sys::Element>().ok())
         {
             Some(el) => el,
             None => return,
@@ -492,18 +491,15 @@ impl Registry {
         let run_handler = |el: &web_sys::Element| {
             if let Some(l) = LISTENER_ID_PROP
                 .with(|prop| js_sys::Reflect::get(el, prop).ok())
-                .map(|v| v.dyn_into().ok())
-                .flatten()
-                .map(|num: js_sys::Number| {
+                .and_then(|v| v.dyn_into().ok())
+                .and_then(|num: js_sys::Number| {
                     Registry::with(|r| {
                         r.by_id
                             .get(&(num.value_of() as u32))
-                            .map(|s| s.get(&desc))
-                            .flatten()
+                            .and_then(|s| s.get(&desc))
                             .cloned()
                     })
                 })
-                .flatten()
             {
                 for l in l {
                     l.handle(event.clone());
diff --git a/tools/process-benchmark-results/src/main.rs b/tools/process-benchmark-results/src/main.rs
index 73b1d1d3575..586eaa8c618 100644
--- a/tools/process-benchmark-results/src/main.rs
+++ b/tools/process-benchmark-results/src/main.rs
@@ -20,7 +20,7 @@ fn main() -> Result<()> {
     let transformed_benchmarks: Vec<GhActionBenchmark> = input_json
         .into_iter()
         .map(|v| GhActionBenchmark {
-            name: format!("{} {}", v["framework"], v["benchmark"]).replace("\"", ""),
+            name: format!("{} {}", v["framework"], v["benchmark"]).replace('\"', ""),
             unit: String::default(),
             value: v["median"].to_string(),
         })
diff --git a/tools/website-test/build.rs b/tools/website-test/build.rs
index 23f552a4afa..596da514d23 100644
--- a/tools/website-test/build.rs
+++ b/tools/website-test/build.rs
@@ -86,7 +86,7 @@ impl Level {
                 .unwrap()
                 .to_str()
                 .unwrap()
-                .replace("-", "_");
+                .replace('-', "_");
 
             self.write_space(dst, level);