Minor fixes from clippy and Claude.

Author: mikeday

src/binary.rs

@@ -17,7 +17,7 @@ pub mod write;
 /// assert_eq!(padded_length, 124);
 /// ```
 pub const fn long_align(len: usize) -> usize {
-    (len + 3) / 4 * 4
+    len.div_ceil(4) * 4
 }
 
 /// Calculate the length required to 16-bit (word) align data of length `len`
@@ -32,7 +32,7 @@ pub const fn long_align(len: usize) -> usize {
 /// assert_eq!(padded_length, 124);
 /// ```
 pub const fn word_align(len: usize) -> usize {
-    (len + 1) / 2 * 2
+    len.div_ceil(2) * 2
 }
 
 /// Unsigned 8-bit binary type.

src/binary/read.rs

@@ -166,13 +166,13 @@ pub struct ReadArray<'a, T: ReadFixedSizeDep> {
     args: T::Args<'a>,
 }
 
-impl<'a, T: ReadFixedSizeDep> Clone for ReadArray<'a, T> {
+impl<T: ReadFixedSizeDep> Clone for ReadArray<'_, T> {
     fn clone(&self) -> Self {
         *self
     }
 }
 
-impl<'a, T: ReadFixedSizeDep> Copy for ReadArray<'a, T> {}
+impl<T: ReadFixedSizeDep> Copy for ReadArray<'_, T> {}
 
 pub struct ReadArrayIter<'a, T: ReadUnchecked> {
     scope: ReadScope<'a>,

src/binary/write.rs

@@ -2,7 +2,6 @@
 
 //! Write binary data
 
-use std::iter;
 use std::marker::PhantomData;
 
 use crate::binary::read::{ReadArray, ReadArrayCow, ReadScope, ReadUnchecked};
@@ -313,7 +312,7 @@ impl WriteContext for WriteBuffer {
     }
 
     fn write_zeros(&mut self, count: usize) -> Result<(), WriteError> {
-        let zeros = iter::repeat(0).take(count);
+        let zeros = std::iter::repeat_n(0, count);
         self.data.extend(zeros);
         Ok(())
     }

src/cff.rs

@@ -2053,7 +2053,7 @@ impl TryFrom<&Operand> for f32 {
                 .contains(int)
                 .then_some(*int as f32)
                 .ok_or(ParseError::LimitExceeded),
-            Operand::Real(r) => f64::try_from(r).map_err(ParseError::from).and_then(|val| {
+            Operand::Real(r) => f64::try_from(r).and_then(|val| {
                 (f32::MIN as f64..=f32::MAX as f64)
                     .contains(&val)
                     .then_some(val as f32)

src/cff/charstring.rs

@@ -896,7 +896,7 @@ impl<'a, 'data> CharStringVisitorContext<'a, 'data> {
                                 return Err(CFFError::MissingVariationStore.into());
                             };
 
-                            if stack.len() > 0 {
+                            if !stack.is_empty() {
                                 visitor.visit(op.try_into().unwrap(), stack)?;
 
                                 // Lookup the ItemVariationStore data to get the variation regions

src/cff/subset.rs

@@ -294,7 +294,7 @@ fn copy_used_subrs(
         if dst_subr_index
             .data
             .get(subr_index)
-            .map_or(false, |subr| !subr.is_empty())
+            .is_some_and(|subr| !subr.is_empty())
         {
             continue;
         }

src/gdef.rs

@@ -33,7 +33,5 @@ pub fn glyph_is_mark_in_set(opt_gdef_table: Option<&GDEFTable>, glyph: u16, inde
         && opt_gdef_table
             .and_then(|gdef| gdef.opt_mark_glyph_sets.as_ref())
             .and_then(|mark_glyph_sets| mark_glyph_sets.get(index))
-            .map_or(false, |mark_set| {
-                mark_set.glyph_coverage_value(glyph).is_some()
-            })
+            .is_some_and(|mark_set| mark_set.glyph_coverage_value(glyph).is_some())
 }

src/glyph_position.rs

@@ -350,7 +350,7 @@ fn is_upright_glyph(info: &Info) -> bool {
             .glyph
             .unicodes
             .first()
-            .map_or(false, |&ch| is_upright_char(ch))
+            .is_some_and(|&ch| is_upright_char(ch))
 }
 
 #[cfg(test)]

src/gsub.rs

@@ -748,7 +748,7 @@ fn apply_subst_context<T: GlyphData>(
         None => return Ok(None), // FIXME actually an error/impossible?
     };
     for (subst_index, subst_lookup_index) in subst.lookup_array {
-        match apply_subst(
+        if let Some(changes0) = apply_subst(
             recursion_limit,
             gsub_cache,
             lookup_list,
@@ -761,8 +761,7 @@ fn apply_subst_context<T: GlyphData>(
             max_glyphs,
             i,
         )? {
-            Some(changes0) => changes += changes0,
-            None => {}
+            changes += changes0
         }
     }
     match checked_add(len, changes) {

src/scripts/myanmar.rs

@@ -854,7 +854,7 @@ fn tag_syllable(
         // with POS_BEFORE_SUBJOINED
         else if glyph.is(a)
             && prev_glyph_skip(before_i, a)
-                .map_or(false, |prev| prev.pos() == Some(Pos::BelowbaseConsonant))
+                .is_some_and(|prev| prev.pos() == Some(Pos::BelowbaseConsonant))
         {
             glyph.set_pos(Some(Pos::BeforeSubjoined))
         }