Merge pull request #2096 from iced-rs/fix/some-more-lints

Fix some `clippy::pedantic` lints

7 files changed, 15 insertions, 15 deletions

diff --git a/wgpu/src/buffer.rs b/wgpu/src/buffer.rs
index 94122187..ef00c58f 100644
--- a/wgpu/src/buffer.rs
+++ b/wgpu/src/buffer.rs
@@ -87,7 +87,7 @@ impl<T: bytemuck::Pod> Buffer<T> {
 
     /// Clears any temporary data (i.e. offsets) from the buffer.
     pub fn clear(&mut self) {
-        self.offsets.clear()
+        self.offsets.clear();
     }
 
     /// Returns the offset at `index`, if it exists.
diff --git a/wgpu/src/color.rs b/wgpu/src/color.rs
index a1025601..20827e3c 100644
--- a/wgpu/src/color.rs
+++ b/wgpu/src/color.rs
@@ -12,7 +12,7 @@ pub fn convert(
 
     let sampler = device.create_sampler(&wgpu::SamplerDescriptor {
         label: Some("iced_wgpu.offscreen.sampler"),
-        ..Default::default()
+        ..wgpu::SamplerDescriptor::default()
     });
 
     //sampler in 0
@@ -102,10 +102,10 @@ pub fn convert(
             primitive: wgpu::PrimitiveState {
                 topology: wgpu::PrimitiveTopology::TriangleList,
                 front_face: wgpu::FrontFace::Cw,
-                ..Default::default()
+                ..wgpu::PrimitiveState::default()
             },
             depth_stencil: None,
-            multisample: Default::default(),
+            multisample: wgpu::MultisampleState::default(),
             multiview: None,
         });
 
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index 63a59c05..655362b7 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -480,7 +480,7 @@ impl Frame {
                                 },
                                 size: self.size,
                             }),
-                        ))
+                        ));
                     }
                 }
                 Buffer::Gradient(buffer) => {
@@ -493,7 +493,7 @@ impl Frame {
                                 },
                                 size: self.size,
                             }),
-                        ))
+                        ));
                     }
                 }
             }
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 1253496b..789e35b4 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -104,7 +104,7 @@ impl Atlas {
 
             padded_data[offset..offset + 4 * width as usize].copy_from_slice(
                 &data[row * 4 * width as usize..(row + 1) * 4 * width as usize],
-            )
+            );
         }
 
         match &entry {
@@ -237,7 +237,7 @@ impl Atlas {
                         }));
                     }
                 }
-                _ => {}
+                Layer::Full => {}
             }
         }
 
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 7a5a0f7c..d20dbe66 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -202,7 +202,7 @@ impl<'a> Layer<'a> {
                         translation,
                         primitive,
                         current_layer,
-                    )
+                    );
                 }
             }
             Primitive::Clip { bounds, content } => {
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index bd4f3e06..2a530cad 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -64,7 +64,7 @@ impl Pipeline {
             self.renderers.push(glyphon::TextRenderer::new(
                 &mut self.atlas,
                 device,
-                Default::default(),
+                wgpu::MultisampleState::default(),
                 None,
             ));
         }
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 7e1bd9cc..f8014ceb 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -329,12 +329,12 @@ impl Pipeline {
 
 fn fragment_target(
     texture_format: wgpu::TextureFormat,
-) -> Option<wgpu::ColorTargetState> {
-    Some(wgpu::ColorTargetState {
+) -> wgpu::ColorTargetState {
+    wgpu::ColorTargetState {
         format: texture_format,
         blend: Some(wgpu::BlendState::ALPHA_BLENDING),
         write_mask: wgpu::ColorWrites::ALL,
-    })
+    }
 }
 
 fn primitive_state() -> wgpu::PrimitiveState {
@@ -521,7 +521,7 @@ mod solid {
                         fragment: Some(wgpu::FragmentState {
                             module: &shader,
                             entry_point: "solid_fs_main",
-                            targets: &[triangle::fragment_target(format)],
+                            targets: &[Some(triangle::fragment_target(format))],
                         }),
                         primitive: triangle::primitive_state(),
                         depth_stencil: None,
@@ -698,7 +698,7 @@ mod gradient {
                     fragment: Some(wgpu::FragmentState {
                         module: &shader,
                         entry_point: "gradient_fs_main",
-                        targets: &[triangle::fragment_target(format)],
+                        targets: &[Some(triangle::fragment_target(format))],
                     }),
                     primitive: triangle::primitive_state(),
                     depth_stencil: None,