summaryrefslogtreecommitdiffstats
path: root/wgpu
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-02-09 07:00:21 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-02-24 13:37:32 +0100
commit17a4d817c45da732e9fdc6559b6bbc7d5be94052 (patch)
tree110473173fbafe63ee866ac49b77e78ea84d8b09 /wgpu
parent2097a56b58d8fe1784a625f69c1cdd38fcfb9a52 (diff)
downloadiced-17a4d817c45da732e9fdc6559b6bbc7d5be94052.tar.gz
iced-17a4d817c45da732e9fdc6559b6bbc7d5be94052.tar.bz2
iced-17a4d817c45da732e9fdc6559b6bbc7d5be94052.zip
Collapse conditional and please `clippy`
Diffstat (limited to 'wgpu')
-rw-r--r--wgpu/src/backend.rs10
-rw-r--r--wgpu/src/text.rs1
2 files changed, 6 insertions, 5 deletions
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 {