summaryrefslogtreecommitdiffstats
path: root/wgpu/src/image
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2022-07-09 19:03:40 +0200
committerLibravatar GitHub <noreply@github.com>2022-07-09 19:03:40 +0200
commit9051dd6977d045f991092e247e6bd9da40d2e793 (patch)
treecde7d983ffc085ed908be776e9021a8e41b44b44 /wgpu/src/image
parentc4c1221be62f51dd9f1d20ea2c4ea6e2c94e20aa (diff)
parente548d6c0d5b430b090821e673dc453a24c885fbe (diff)
downloadiced-9051dd6977d045f991092e247e6bd9da40d2e793.tar.gz
iced-9051dd6977d045f991092e247e6bd9da40d2e793.tar.bz2
iced-9051dd6977d045f991092e247e6bd9da40d2e793.zip
Merge pull request #1379 from PolyMeilex/fix/clippy
Address Clippy lints
Diffstat (limited to 'wgpu/src/image')
-rw-r--r--wgpu/src/image/atlas.rs8
-rw-r--r--wgpu/src/image/atlas/layer.rs5
-rw-r--r--wgpu/src/image/raster.rs4
-rw-r--r--wgpu/src/image/vector.rs4
4 files changed, 6 insertions, 15 deletions
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index c1347e55..953dd4e2 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -113,13 +113,7 @@ impl Atlas {
match &entry {
Entry::Contiguous(allocation) => {
self.upload_allocation(
- &buffer,
- width,
- height,
- padding,
- 0,
- &allocation,
- encoder,
+ &buffer, width, height, padding, 0, allocation, encoder,
);
}
Entry::Fragmented { fragments, .. } => {
diff --git a/wgpu/src/image/atlas/layer.rs b/wgpu/src/image/atlas/layer.rs
index b1084ed9..cf089601 100644
--- a/wgpu/src/image/atlas/layer.rs
+++ b/wgpu/src/image/atlas/layer.rs
@@ -9,9 +9,6 @@ pub enum Layer {
impl Layer {
pub fn is_empty(&self) -> bool {
- match self {
- Layer::Empty => true,
- _ => false,
- }
+ matches!(self, Layer::Empty)
}
}
diff --git a/wgpu/src/image/raster.rs b/wgpu/src/image/raster.rs
index ec5e911f..2b4d4af3 100644
--- a/wgpu/src/image/raster.rs
+++ b/wgpu/src/image/raster.rs
@@ -59,7 +59,7 @@ impl Cache {
}
}
image::Data::Bytes(bytes) => {
- if let Ok(image) = image_rs::load_from_memory(&bytes) {
+ if let Ok(image) = image_rs::load_from_memory(bytes) {
let operation =
Operation::from_exif(&mut std::io::Cursor::new(bytes))
.ok()
@@ -103,7 +103,7 @@ impl Cache {
if let Memory::Host(image) = memory {
let (width, height) = image.dimensions();
- let entry = atlas.upload(width, height, &image, device, encoder)?;
+ let entry = atlas.upload(width, height, image, device, encoder)?;
*memory = Memory::Device(entry);
}
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index 4c830913..b08a0aa2 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -60,7 +60,7 @@ impl Cache {
}
svg::Data::Bytes(bytes) => {
match usvg::Tree::from_data(
- &bytes,
+ bytes,
&usvg::Options::default().to_ref(),
) {
Ok(tree) => Svg::Loaded(tree),
@@ -112,7 +112,7 @@ impl Cache {
// It would be cool to be able to smooth resize the `svg` example.
let mut img = tiny_skia::Pixmap::new(width, height)?;
- let _ = resvg::render(
+ resvg::render(
tree,
if width > height {
usvg::FitTo::Width(width)