diff --git a/render-wasm/src/math/bools.rs b/render-wasm/src/math/bools.rs index 5e43764826..4ada56d8a5 100644 --- a/render-wasm/src/math/bools.rs +++ b/render-wasm/src/math/bools.rs @@ -300,7 +300,7 @@ impl Ord for BezierStart { type BM<'a> = BTreeMap>; -fn init_bm(beziers: &[(BezierSource, Bezier)]) -> BM { +fn init_bm(beziers: &[(BezierSource, Bezier)]) -> BM<'_> { let mut bm = BM::default(); for entry @ (source, bezier) in beziers.iter() { let value = *entry; diff --git a/render-wasm/src/render/text.rs b/render-wasm/src/render/text.rs index 4f69d38926..5ce58ac533 100644 --- a/render-wasm/src/render/text.rs +++ b/render-wasm/src/render/text.rs @@ -83,8 +83,8 @@ fn get_text_stroke_paints( let shader = text_paint.shader(); let mut is_opaque = true; - if shader.is_some() { - is_opaque = shader.unwrap().is_opaque(); + if let Some(shader) = shader { + is_opaque = shader.is_opaque(); } if is_opaque && count_inner_strokes == 1 { diff --git a/render-wasm/src/shapes.rs b/render-wasm/src/shapes.rs index c8c6c96b34..5b421ad3e6 100644 --- a/render-wasm/src/shapes.rs +++ b/render-wasm/src/shapes.rs @@ -504,7 +504,7 @@ impl Shape { (added, removed) } - pub fn fills(&self) -> std::slice::Iter { + pub fn fills(&self) -> std::slice::Iter<'_, Fill> { self.fills.iter() } diff --git a/render-wasm/src/shapes/bools.rs b/render-wasm/src/shapes/bools.rs index 9fa6610887..644c4108d2 100644 --- a/render-wasm/src/shapes/bools.rs +++ b/render-wasm/src/shapes/bools.rs @@ -1,30 +1,16 @@ use super::Path; -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Default, Clone, PartialEq)] pub struct Bool { pub bool_type: BoolType, pub path: Path, } -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Default, Clone, Copy, PartialEq)] pub enum BoolType { + #[default] Union, Difference, Intersection, Exclusion, } - -impl Default for Bool { - fn default() -> Self { - Bool { - bool_type: BoolType::Union, - path: Path::default(), - } - } -} - -impl Default for BoolType { - fn default() -> Self { - Self::Union - } -} diff --git a/render-wasm/src/shapes/shadows.rs b/render-wasm/src/shapes/shadows.rs index 28d940eddd..71e09a493c 100644 --- a/render-wasm/src/shapes/shadows.rs +++ b/render-wasm/src/shapes/shadows.rs @@ -3,18 +3,13 @@ use skia_safe::{self as skia, image_filters, ImageFilter, Paint}; use super::Color; use crate::render::filters::compose_filters; -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Default, Clone, Copy, PartialEq)] pub enum ShadowStyle { + #[default] Drop, Inner, } -impl Default for ShadowStyle { - fn default() -> Self { - Self::Drop - } -} - #[derive(Debug, Clone, Copy, PartialEq)] pub struct Shadow { pub color: Color, diff --git a/render-wasm/src/wasm/paths.rs b/render-wasm/src/wasm/paths.rs index aa70cbe3a2..5fb9bc7c28 100644 --- a/render-wasm/src/wasm/paths.rs +++ b/render-wasm/src/wasm/paths.rs @@ -180,7 +180,7 @@ pub extern "C" fn set_shape_path_buffer() { let buffer = get_path_upload_buffer(); let mut buffer = buffer.lock().unwrap(); let chunk_size = size_of::(); - if buffer.len() % chunk_size != 0 { + if !buffer.len().is_multiple_of(chunk_size) { // FIXME println!("Warning: buffer length is not a multiple of chunk size!"); }