Clippy + fmt

src/cmap/mod.rs

@@ -64,9 +64,7 @@ pub(crate) fn subset(ctx: &mut Context) -> Result<()> {
     Ok(())
 }
 
-fn subset_subtables(
-    ctx: &mut Context,
-) -> Result<Vec<(EncodingRecord, Vec<u8>)>> {
+fn subset_subtables(ctx: &mut Context) -> Result<Vec<(EncodingRecord, Vec<u8>)>> {
     let cmap = ctx.expect_table(Tag::CMAP)?;
     let mut reader = Reader::new(cmap);
 

src/cmap/subtable12.rs

@@ -114,7 +114,7 @@ pub(crate) fn subset_subtable12(ctx: &Context, data: &[u8]) -> crate::Result<Vec
                 }
             }
 
-            return None;
+            None
         })
         .collect::<Vec<_>>();
 
@@ -128,12 +128,12 @@ pub(crate) fn subset_subtable12(ctx: &Context, data: &[u8]) -> crate::Result<Vec
         let mut cur_gid = first.1;
         let mut cur_range = 0;
 
-        while let Some(next) = map_iter.next() {
-            if next.0 == cur_start + cur_range + 1 {
-                if next.1 as u32 == cur_gid as u32 + cur_range + 1 {
-                    cur_range += 1;
-                    continue;
-                }
+        for next in map_iter {
+            if next.0 == cur_start + cur_range + 1
+                && next.1 as u32 == cur_gid as u32 + cur_range + 1
+            {
+                cur_range += 1;
+                continue;
             }
 
             new_groups.push(SequentialMapGroupRecord {

src/cmap/subtable4.rs

@@ -165,7 +165,7 @@ pub(crate) fn subset_subtable4(ctx: &Context, data: &[u8]) -> crate::Result<Vec<
                 }
             }
 
-            return None;
+            None
         })
         .collect::<Vec<_>>();
 
@@ -181,12 +181,10 @@ pub(crate) fn subset_subtable4(ctx: &Context, data: &[u8]) -> crate::Result<Vec<
         let mut cur_delta = delta(first);
         let mut cur_range = 0;
 
-        while let Some(next) = map_iter.next() {
-            if next.0 == cur_start + cur_range + 1 {
-                if delta(next) == cur_delta {
-                    cur_range += 1;
-                    continue;
-                }
+        for next in map_iter {
+            if next.0 == cur_start + cur_range + 1 && delta(next) == cur_delta {
+                cur_range += 1;
+                continue;
             }
 
             segments.push((cur_start, cur_start + cur_range, cur_delta));

src/glyf.rs

@@ -144,7 +144,7 @@ pub(crate) fn subset(ctx: &mut Context) -> Result<()> {
         let data = table.glyph_data(*old_gid)?;
 
         // Not contours
-        if data.len() == 0 {
+        if data.is_empty() {
             continue;
         }
 

src/lib.rs

@@ -331,11 +331,9 @@ impl<'a> Context<'a> {
         let mut original_gids = self.subset.iter().collect::<Vec<_>>();
         original_gids.sort();
 
-        let mut counter = 0;
-        for gid in original_gids {
-            self.gid_map.insert(*gid, counter);
+        for (counter, gid) in original_gids.into_iter().enumerate() {
+            self.gid_map.insert(*gid, counter as u16);
             self.reverse_gid_map.push(*gid);
-            counter += 1;
         }
     }
 

src/name.rs

@@ -72,7 +72,7 @@ pub(crate) fn subset(ctx: &mut Context) -> Result<()> {
 
     let mut pruned = prune_name_records(name_records);
 
-    if pruned.len() == 0 && count != 0 {
+    if pruned.is_empty() && count != 0 {
         // Only contains non-Unicode records, so we don't subset.
         ctx.push(Tag::NAME, name);
         return Ok(());