Merge pull request #2090 from nyurik/mapping

Chore: Apply clippy map transformations
iced-rs · Sep 19, 2023 · 582da10 · 582da10
2 parents a4dbf07 + c997aad
commit 582da10
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 15 deletions.
diff --git a/core/src/mouse/click.rs b/core/src/mouse/click.rs
@@ -69,8 +69,6 @@ impl Click {
         };
 
         self.position == new_position
-            && duration
-                .map(|duration| duration.as_millis() <= 300)
-                .unwrap_or(false)
+            && duration.is_some_and(|duration| duration.as_millis() <= 300)
     }
 }
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
@@ -200,8 +200,10 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
                                     viewport.scale_factor(),
                                 )
                             })
-                            .map(mouse::Cursor::Available)
-                            .unwrap_or(mouse::Cursor::Unavailable),
+                            .map_or(
+                                mouse::Cursor::Unavailable,
+                                mouse::Cursor::Available,
+                            ),
                         &mut renderer,
                         &Theme::Dark,
                         &renderer::Style {

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
@@ -293,10 +293,7 @@ fn numeric_input(
 ) -> Element<'_, Option<u32>> {
     text_input(
         placeholder,
-        &value
-            .as_ref()
-            .map(ToString::to_string)
-            .unwrap_or_else(String::new),
+        &value.as_ref().map_or_else(String::new, ToString::to_string),
     )
     .on_input(move |text| {
         if text.is_empty() {

diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
@@ -56,7 +56,7 @@ impl Cache {
                         .ok()
                 });
 
-                tree.map(Svg::Loaded).unwrap_or(Svg::NotFound)
+                tree.map_or(Svg::NotFound, Svg::Loaded)
             }
             svg::Data::Bytes(bytes) => {
                 match usvg::Tree::from_data(bytes, &usvg::Options::default()) {

diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
@@ -349,7 +349,7 @@ fn multisample_state(
     antialiasing: Option<Antialiasing>,
 ) -> wgpu::MultisampleState {
     wgpu::MultisampleState {
-        count: antialiasing.map(|a| a.sample_count()).unwrap_or(1),
+        count: antialiasing.map_or(1, Antialiasing::sample_count),
         mask: !0,
         alpha_to_coverage_enabled: false,
     }

diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
@@ -97,8 +97,7 @@ where
                     self.viewport.scale_factor(),
                 )
             })
-            .map(mouse::Cursor::Available)
-            .unwrap_or(mouse::Cursor::Unavailable)
+            .map_or(mouse::Cursor::Unavailable, mouse::Cursor::Available)
     }
 
     /// Returns the current keyboard modifiers of the [`State`].

diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
@@ -17,8 +17,7 @@ impl Clipboard {
     pub fn connect(window: &winit::window::Window) -> Clipboard {
         let state = window_clipboard::Clipboard::connect(window)
             .ok()
-            .map(State::Connected)
-            .unwrap_or(State::Unavailable);
+            .map_or(State::Unavailable, State::Connected);
 
         Clipboard { state }
     }