From e660ad9ad04b3ce68ca66fb69ac3d8a63a9e222d Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sat, 24 Oct 2026 02:19:35 +0000 Subject: [PATCH] fix(compose): revert slice conversion in tests and remove unused var in warichu --- crates/compose/src/tests.rs | 2 +- crates/compose/src/warichu.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/compose/src/tests.rs b/crates/compose/src/tests.rs index 3909998c..b73806d2 100644 --- a/crates/compose/src/tests.rs +++ b/crates/compose/src/tests.rs @@ -2892,7 +2892,7 @@ fn test_font(family: &str, os2_fields: Option<&[(usize, i16)]>) -> Vec { /// [`test_font`] with OS/2 `sTypoAscender` set to `typo_ascender`, or without OS/2 for `None`. fn typo_test_font(family: &str, typo_ascender: Option) -> Vec { - test_font(family, typo_ascender.map(|v| [(TYPO_ASCENDER, v)]).as_ref().map(<[_]>::as_slice)) + test_font(family, typo_ascender.map(|v| [(TYPO_ASCENDER, v)]).as_ref().map(|f| f.as_slice())) } /// First baseline (frame space) of a 20 pt line in `family` in a frame at y = 36 with a 4 pt top diff --git a/crates/compose/src/warichu.rs b/crates/compose/src/warichu.rs index 6026d7e4..14304631 100644 --- a/crates/compose/src/warichu.rs +++ b/crates/compose/src/warichu.rs @@ -217,7 +217,6 @@ fn layout(styles: &[RunStyle], line: &mut [PlacedGlyph], members: &[usize]) -> f restore(line, members, &saved); return 0.0; } - let rows = counts.len().max(1); let small = st.size * scale; // 0 is the default (one small em). Any other value, including a negative one, is added to // that em and then clamped so the rows cannot swap order.