From 17a4d817c45da732e9fdc6559b6bbc7d5be94052 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 9 Feb 2023 07:00:21 +0100
Subject: Collapse conditional and please `clippy`

---
 wgpu/src/backend.rs | 10 +++++-----
 wgpu/src/text.rs    |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 7f44fafa..e650d9a5 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -137,17 +137,17 @@ impl Backend {
                 continue;
             }
 
-            if !layer.text.is_empty() {
-                if !self.text_pipeline.prepare(
+            if !layer.text.is_empty()
+                && !self.text_pipeline.prepare(
                     device,
                     queue,
                     &layer.text,
                     layer.bounds,
                     scale_factor,
                     target_size,
-                ) {
-                    return false;
-                }
+                )
+            {
+                return false;
             }
         }
 
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 4406177a..c0f49417 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -187,6 +187,7 @@ impl Pipeline {
                 Err(glyphon::PrepareError::AtlasFull(content_type)) => {
                     self.prepare_layer = 0;
 
+                    #[allow(clippy::needless_bool)]
                     if self.atlas.grow(device, content_type) {
                         false
                     } else {
-- 
cgit