diff options
author | 2022-11-03 04:53:27 +0100 | |
---|---|---|
committer | 2022-11-03 04:53:27 +0100 | |
commit | 7e22e2d45293c5916812be03dc7367134b69b3ad (patch) | |
tree | 2d1814e37599644ec2bf093ed6ce42eb1a0cb34b /wgpu/src | |
parent | edce457365aae5e1aa20863389cdd28357234908 (diff) | |
download | iced-7e22e2d45293c5916812be03dc7367134b69b3ad.tar.gz iced-7e22e2d45293c5916812be03dc7367134b69b3ad.tar.bz2 iced-7e22e2d45293c5916812be03dc7367134b69b3ad.zip |
Fix lints by `clippy`
Diffstat (limited to '')
-rw-r--r-- | wgpu/src/buffers.rs | 3 | ||||
-rw-r--r-- | wgpu/src/buffers/dynamic.rs | 4 | ||||
-rw-r--r-- | wgpu/src/triangle.rs | 4 | ||||
-rw-r--r-- | wgpu/src/triangle/solid.rs | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/wgpu/src/buffers.rs b/wgpu/src/buffers.rs index 34fe0fca..707ad832 100644 --- a/wgpu/src/buffers.rs +++ b/wgpu/src/buffers.rs @@ -57,8 +57,7 @@ impl<T: Pod + Zeroable> StaticBuffer<T> { /// Returns whether or not the buffer needs to be recreated. This can happen whenever mesh data /// changes & a redraw is requested. pub fn resize(&mut self, device: &wgpu::Device, new_count: usize) -> bool { - let size = - wgpu::BufferAddress::from((mem::size_of::<T>() * new_count) as u64); + let size = (mem::size_of::<T>() * new_count) as u64; if self.size < size { self.offsets.clear(); diff --git a/wgpu/src/buffers/dynamic.rs b/wgpu/src/buffers/dynamic.rs index 3c65d6e1..f1262d83 100644 --- a/wgpu/src/buffers/dynamic.rs +++ b/wgpu/src/buffers/dynamic.rs @@ -180,8 +180,8 @@ impl<T: ShaderType + WriteInto> Buffer<T> { let offset = self .offsets .get(index) - .expect("Index not found in offsets.") - .clone(); + .copied() + .expect("Index not found in offsets."); offset } diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs index a21e0fac..2af35588 100644 --- a/wgpu/src/triangle.rs +++ b/wgpu/src/triangle.rs @@ -134,8 +134,8 @@ impl Pipeline { &mesh.buffers.indices, ); - vertex_offset = vertex_offset + new_vertex_offset; - index_offset = index_offset + new_index_offset; + vertex_offset += new_vertex_offset; + index_offset += new_index_offset; self.index_strides.push(mesh.buffers.indices.len() as u32); diff --git a/wgpu/src/triangle/solid.rs b/wgpu/src/triangle/solid.rs index 75455310..9d85ff7b 100644 --- a/wgpu/src/triangle/solid.rs +++ b/wgpu/src/triangle/solid.rs @@ -57,7 +57,7 @@ impl Pipeline { }); let bind_group = - Pipeline::bind_group(device, &buffer.raw(), &bind_group_layout); + Pipeline::bind_group(device, buffer.raw(), &bind_group_layout); let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { |