From b27762554627b8e89f2b840b1a8a512e22d4cd87 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 20 Sep 2023 16:26:43 +0200
Subject: Revert "Chore: Apply clippy map transformations"

This reverts commit c997aad85d7ee6e77085e50e5e599002549d228f.
---
 wgpu/src/image/vector.rs | 2 +-
 wgpu/src/triangle.rs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'wgpu/src')

diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index e8baae4f..6582bb82 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -56,7 +56,7 @@ impl Cache {
                         .ok()
                 });
 
-                tree.map_or(Svg::NotFound, Svg::Loaded)
+                tree.map(Svg::Loaded).unwrap_or(Svg::NotFound)
             }
             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
index f8014ceb..c55b93bf 100644
--- 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_or(1, Antialiasing::sample_count),
+        count: antialiasing.map(|a| a.sample_count()).unwrap_or(1),
         mask: !0,
         alpha_to_coverage_enabled: false,
     }
-- 
cgit