Clippy fixed

Author: asibahi

examples/font2svg.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::too_many_arguments)]
+
 use base64::engine::general_purpose::STANDARD;
 
 use std::io::Write;
@@ -167,7 +169,7 @@ fn process(args: Args) -> Result<(), Box<dyn std::error::Error>> {
                 &mut svg,
                 &mut path_buf,
             );
-        } else if let Some(img) = face.glyph_raster_image(gid, std::u16::MAX) {
+        } else if let Some(img) = face.glyph_raster_image(gid, u16::MAX) {
             svg.start_element("image");
             svg.write_attribute("x", &(x + 2.0 + img.x as f64));
             svg.write_attribute("y", &(y - img.y as f64));
@@ -208,7 +210,7 @@ fn process(args: Args) -> Result<(), Box<dyn std::error::Error>> {
 
     println!("Elapsed: {}ms", now.elapsed().as_micros() as f64 / 1000.0);
 
-    std::fs::write(&args.svg_path, &svg.end_document())?;
+    std::fs::write(&args.svg_path, svg.end_document())?;
 
     Ok(())
 }

src/aat.rs

@@ -174,7 +174,7 @@ impl<'a> StateTable<'a> {
     #[inline]
     pub fn class(&self, glyph_id: GlyphId) -> Option<u8> {
         if glyph_id.0 == 0xFFFF {
-            return Some(class::DELETED_GLYPH as u8);
+            return Some(class::DELETED_GLYPH);
         }
 
         let idx = glyph_id.0.checked_sub(self.first_glyph.0)?;
@@ -185,7 +185,7 @@ impl<'a> StateTable<'a> {
     #[inline]
     pub fn entry(&self, state: u16, mut class: u8) -> Option<StateEntry> {
         if u16::from(class) >= self.number_of_classes {
-            class = class::OUT_OF_BOUNDS as u8;
+            class = class::OUT_OF_BOUNDS;
         }
 
         let entry_idx = self

src/delta_set.rs

@@ -36,7 +36,7 @@ impl<'a> DeltaSetIndexMap<'a> {
         let entry_size = ((entry_format >> 4) & 3) + 1;
         let inner_index_bit_count = u32::from((entry_format & 0xF) + 1);
 
-        s.advance(usize::try_from(entry_size).ok()? * usize::try_from(index).ok()?);
+        s.advance(usize::from(entry_size) * usize::try_from(index).ok()?);
 
         let mut n = 0u32;
         for b in s.read_bytes(usize::from(entry_size))? {

src/lib.rs

@@ -43,6 +43,7 @@ Font parsing starts with a [`Face`].
 #![allow(clippy::collapsible_else_if)]
 #![allow(clippy::field_reassign_with_default)]
 #![allow(clippy::upper_case_acronyms)]
+#![allow(clippy::bool_assert_comparison)]
 
 #[cfg(feature = "std")]
 #[macro_use]
@@ -368,19 +369,19 @@ impl RectF {
     #[inline]
     fn new() -> Self {
         RectF {
-            x_min: core::f32::MAX,
-            y_min: core::f32::MAX,
-            x_max: core::f32::MIN,
-            y_max: core::f32::MIN,
+            x_min: f32::MAX,
+            y_min: f32::MAX,
+            x_max: f32::MIN,
+            y_max: f32::MIN,
         }
     }
 
     #[inline]
     fn is_default(&self) -> bool {
-        self.x_min == core::f32::MAX
-            && self.y_min == core::f32::MAX
-            && self.x_max == core::f32::MIN
-            && self.y_max == core::f32::MIN
+        self.x_min == f32::MAX
+            && self.y_min == f32::MAX
+            && self.x_max == f32::MIN
+            && self.y_max == f32::MIN
     }
 
     #[inline]

src/parser.rs

@@ -238,10 +238,10 @@ impl TryNumFrom<f32> for i32 {
 
         // We can't represent `MIN-1` exactly, but there's no fractional part
         // at this magnitude, so we can just use a `MIN` inclusive boundary.
-        const MIN: f32 = core::i32::MIN as f32;
+        const MIN: f32 = i32::MIN as f32;
         // We can't represent `MAX` exactly, but it will round up to exactly
         // `MAX+1` (a power of two) when we cast it.
-        const MAX_P1: f32 = core::i32::MAX as f32;
+        const MAX_P1: f32 = i32::MAX as f32;
         if v >= MIN && v < MAX_P1 {
             Some(v as i32)
         } else {
@@ -372,7 +372,7 @@ impl<'a, T: FromData> LazyArray16<'a, T> {
 
 impl<'a, T: FromData + core::fmt::Debug + Copy> core::fmt::Debug for LazyArray16<'a, T> {
     fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        f.debug_list().entries(self.into_iter()).finish()
+        f.debug_list().entries(*self).finish()
     }
 }
 
@@ -522,7 +522,7 @@ impl<'a, T: FromData> LazyArray32<'a, T> {
 
 impl<'a, T: FromData + core::fmt::Debug + Copy> core::fmt::Debug for LazyArray32<'a, T> {
     fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        f.debug_list().entries(self.into_iter()).finish()
+        f.debug_list().entries(*self).finish()
     }
 }
 
@@ -622,7 +622,7 @@ impl<'a, T: FromSlice<'a>> LazyOffsetArray16<'a, T> {
 
 impl<'a, T: FromSlice<'a> + core::fmt::Debug + Copy> core::fmt::Debug for LazyOffsetArray16<'a, T> {
     fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        f.debug_list().entries(self.into_iter()).finish()
+        f.debug_list().entries(*self).finish()
     }
 }
 

src/tables/cff/index.rs

@@ -24,7 +24,7 @@ pub fn parse_index<'a, T: IndexSize>(s: &mut Stream<'a>) -> Option<Index<'a>> {
 
 #[inline(never)]
 fn parse_index_impl<'a>(count: u32, s: &mut Stream<'a>) -> Option<Index<'a>> {
-    if count == 0 || count == core::u32::MAX {
+    if count == 0 || count == u32::MAX {
         return Some(Index::default());
     }
 
@@ -53,7 +53,7 @@ pub fn skip_index<T: IndexSize>(s: &mut Stream) -> Option<()> {
 
 #[inline(never)]
 fn skip_index_impl(count: u32, s: &mut Stream) -> Option<()> {
-    if count == 0 || count == core::u32::MAX {
+    if count == 0 || count == u32::MAX {
         return Some(());
     }
 

src/tables/cmap/format2.rs

@@ -72,8 +72,6 @@ impl<'a> Subtable2<'a> {
     pub fn glyph_index(&self, code_point: u32) -> Option<GlyphId> {
         // This subtable supports code points only in a u16 range.
         let code_point = u16::try_from(code_point).ok()?;
-
-        let code_point = code_point;
         let high_byte = code_point >> 8;
         let low_byte = code_point & 0x00FF;
 

src/tables/colr.rs

@@ -1897,8 +1897,8 @@ impl VariationData<'_> {
 
         let variation_store = self.variation_store.as_ref().unwrap();
 
-        for i in 0..N {
-            deltas[i] = self
+        for (i, delta) in deltas.iter_mut().enumerate() {
+            *delta = self
                 .delta_map
                 .and_then(|d| d.map(var_index_base + i as u32))
                 .and_then(|d| variation_store.parse_delta(d.0, d.1, coordinates))

src/tables/cpal.rs

@@ -47,7 +47,7 @@ impl<'a> Table<'a> {
     /// Returns the number of palettes.
     pub fn palettes(&self) -> NonZeroU16 {
         // Already checked during parsing.
-        NonZeroU16::new(self.color_indices.len() as u16).unwrap()
+        NonZeroU16::new(self.color_indices.len()).unwrap()
     }
 
     /// Returns the color at the given index into the given palette.

src/tables/feat.rs

@@ -117,7 +117,7 @@ impl<'a> FeatureNames<'a> {
 
 impl<'a> core::fmt::Debug for FeatureNames<'a> {
     fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        f.debug_list().entries(self.into_iter()).finish()
+        f.debug_list().entries(*self).finish()
     }
 }