Reformat and merge with main
diff --git a/sparse_strips/vello_cpu/src/fine/common/image.rs b/sparse_strips/vello_cpu/src/fine/common/image.rs index 390ebf5..ebe0b76 100644 --- a/sparse_strips/vello_cpu/src/fine/common/image.rs +++ b/sparse_strips/vello_cpu/src/fine/common/image.rs
@@ -443,41 +443,44 @@ /// Calculate the weights for a single fractional value. fn weights<S: Simd>(simd: S, fract: f32x4<S>) -> [f32x4<S>; 4] { - simd.vectorize(#[inline(always)] || { - let s = fract.simd; - const MF: [[f32; 4]; 4] = mf_resampler(); + simd.vectorize( + #[inline(always)] + || { + let s = fract.simd; + const MF: [[f32; 4]; 4] = mf_resampler(); - [ - single_weight( - fract, - f32x4::splat(s, MF[0][0]), - f32x4::splat(s, MF[0][1]), - f32x4::splat(s, MF[0][2]), - f32x4::splat(s, MF[0][3]), - ), - single_weight( - fract, - f32x4::splat(s, MF[1][0]), - f32x4::splat(s, MF[1][1]), - f32x4::splat(s, MF[1][2]), - f32x4::splat(s, MF[1][3]), - ), - single_weight( - fract, - f32x4::splat(s, MF[2][0]), - f32x4::splat(s, MF[2][1]), - f32x4::splat(s, MF[2][2]), - f32x4::splat(s, MF[2][3]), - ), - single_weight( - fract, - f32x4::splat(s, MF[3][0]), - f32x4::splat(s, MF[3][1]), - f32x4::splat(s, MF[3][2]), - f32x4::splat(s, MF[3][3]), - ), - ] - }) + [ + single_weight( + fract, + f32x4::splat(s, MF[0][0]), + f32x4::splat(s, MF[0][1]), + f32x4::splat(s, MF[0][2]), + f32x4::splat(s, MF[0][3]), + ), + single_weight( + fract, + f32x4::splat(s, MF[1][0]), + f32x4::splat(s, MF[1][1]), + f32x4::splat(s, MF[1][2]), + f32x4::splat(s, MF[1][3]), + ), + single_weight( + fract, + f32x4::splat(s, MF[2][0]), + f32x4::splat(s, MF[2][1]), + f32x4::splat(s, MF[2][2]), + f32x4::splat(s, MF[2][3]), + ), + single_weight( + fract, + f32x4::splat(s, MF[3][0]), + f32x4::splat(s, MF[3][1]), + f32x4::splat(s, MF[3][2]), + f32x4::splat(s, MF[3][3]), + ), + ] + }, + ) } /// Calculate a weight based on the fractional value t and the cubic coefficients.
diff --git a/sparse_strips/vello_hybrid/src/scene.rs b/sparse_strips/vello_hybrid/src/scene.rs index 6ab4812..0985053 100644 --- a/sparse_strips/vello_hybrid/src/scene.rs +++ b/sparse_strips/vello_hybrid/src/scene.rs
@@ -60,14 +60,12 @@ /// Create a new render context with the given width and height in pixels. pub fn new(width: u16, height: u16) -> Self { let render_state = Self::default_render_state(); - let level = Level::fallback(); Self { width, height, wide: Wide::<MODE_HYBRID>::new(width, height), anti_alias: true, paint: render_state.paint, - level, paint_transform: render_state.paint_transform, encoded_paints: vec![], paint_visible: true,
diff --git a/sparse_strips/vello_sparse_tests/tests/mod.rs b/sparse_strips/vello_sparse_tests/tests/mod.rs index 4ab5c1f..51d8086 100644 --- a/sparse_strips/vello_sparse_tests/tests/mod.rs +++ b/sparse_strips/vello_sparse_tests/tests/mod.rs
@@ -20,9 +20,12 @@ #![allow(missing_docs, reason = "we don't need docs for testing")] #![allow(clippy::cast_possible_truncation, reason = "not critical for testing")] -#![allow(clippy::large_stack_arrays, reason = "after some experimentation, this lint seems to be\ +#![allow( + clippy::large_stack_arrays, + reason = "after some experimentation, this lint seems to be\ triggered from `vello_dev_macros` by some mechanism in quote after adding more SIMD variants to the -tests, so there isn't much we can do to prevent it.")] +tests, so there isn't much we can do to prevent it." +)] #[cfg(target_arch = "wasm32")] wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);