Merge pull request #108 from kas-gui/clippy

Clippy

Author: dhardy

Cargo.toml

@@ -64,3 +64,4 @@ unit_arg = "allow"
 needless_lifetimes = "allow"
 neg_cmp_op_on_partial_ord = "allow"
 manual_range_contains = "allow"
+manual_is_multiple_of = "allow"

src/display/glyph_pos.rs

@@ -229,21 +229,21 @@ impl<'a> GlyphRun<'a> {
         if !fmt.flags.is_empty() {
             let glyph = &self.run.glyphs[self.range.start()];
             let position = glyph.position + self.offset;
-            if fmt.flags.contains(EffectFlags::UNDERLINE) {
-                if let Some(metrics) = sf.underline_metrics() {
-                    let y_top = position.1 - metrics.position;
-                    let h = metrics.thickness;
-                    let x1 = position.0;
-                    underline = Some((x1, y_top, h, fmt.e));
-                }
+            if fmt.flags.contains(EffectFlags::UNDERLINE)
+                && let Some(metrics) = sf.underline_metrics()
+            {
+                let y_top = position.1 - metrics.position;
+                let h = metrics.thickness;
+                let x1 = position.0;
+                underline = Some((x1, y_top, h, fmt.e));
             }
-            if fmt.flags.contains(EffectFlags::STRIKETHROUGH) {
-                if let Some(metrics) = sf.strikethrough_metrics() {
-                    let y_top = position.1 - metrics.position;
-                    let h = metrics.thickness;
-                    let x1 = position.0;
-                    strikethrough = Some((x1, y_top, h, fmt.e));
-                }
+            if fmt.flags.contains(EffectFlags::STRIKETHROUGH)
+                && let Some(metrics) = sf.strikethrough_metrics()
+            {
+                let y_top = position.1 - metrics.position;
+                let h = metrics.thickness;
+                let x1 = position.0;
+                strikethrough = Some((x1, y_top, h, fmt.e));
             }
         }
 

src/display/text_runs.rs

@@ -93,12 +93,12 @@ impl TextDisplay {
 
         let mut font_tokens = text.font_tokens(dpem);
         let mut next_fmt = font_tokens.next();
-        if let Some(fmt) = next_fmt.as_ref() {
-            if fmt.start == 0 {
-                font = fmt.font;
-                dpem = fmt.dpem;
-                next_fmt = font_tokens.next();
-            }
+        if let Some(fmt) = next_fmt.as_ref()
+            && fmt.start == 0
+        {
+            font = fmt.font;
+            dpem = fmt.dpem;
+            next_fmt = font_tokens.next();
         }
 
         let fonts = fonts::library();
@@ -160,12 +160,12 @@ impl TextDisplay {
             // Force end of current run?
             let bidi_break = levels[index] != input.level;
 
-            if let Some(fmt) = next_fmt.as_ref() {
-                if to_usize(fmt.start) == index {
-                    font = fmt.font;
-                    dpem = fmt.dpem;
-                    next_fmt = font_tokens.next();
-                }
+            if let Some(fmt) = next_fmt.as_ref()
+                && to_usize(fmt.start) == index
+            {
+                font = fmt.font;
+                dpem = fmt.dpem;
+                next_fmt = font_tokens.next();
             }
 
             if input.script == UNKNOWN_SCRIPT && props.script().is_real() {
@@ -241,10 +241,10 @@ impl TextDisplay {
         };
 
         let font_id = fonts.select_font(&font, input.script)?;
-        if let Some(id) = face_id {
-            if !fonts.contains_face(font_id, id).expect("invalid FontId") {
-                face_id = None;
-            }
+        if let Some(id) = face_id
+            && !fonts.contains_face(font_id, id).expect("invalid FontId")
+        {
+            face_id = None;
         }
         let face_id =
             face_id.unwrap_or_else(|| fonts.first_face_for(font_id).expect("invalid FontId"));

src/display/wrap_lines.rs

@@ -122,12 +122,11 @@ impl TextDisplay {
                 _: PartMetrics,
                 checkpoint: bool,
             ) {
-                if checkpoint {
-                    if let Some(index) = self.parts.last().cloned() {
-                        if index == run_index {
-                            return;
-                        }
-                    }
+                if checkpoint
+                    && let Some(index) = self.parts.last().cloned()
+                    && index == run_index
+                {
+                    return;
                 }
 
                 self.parts.push(run_index);
@@ -443,27 +442,27 @@ impl PartAccumulator for LineAdder {
         let glyph_range = glyph_run.to_glyph_range(part_range);
 
         let justify = self.h_align == Align::Stretch && part.len_no_space > 0.0;
-        if checkpoint && !justify {
-            if let Some(info) = self.parts.last_mut() {
-                if info.run == run {
-                    // Merge into last part info (not strictly necessary)
-
-                    if glyph_run.level.is_ltr() {
-                        info.glyph_range.end = glyph_range.end;
-                    } else {
-                        info.offset = part.offset;
-                        info.glyph_range.start = glyph_range.start;
-                    }
-                    debug_assert!(info.glyph_range.start <= info.glyph_range.end);
+        if checkpoint
+            && !justify
+            && let Some(info) = self.parts.last_mut()
+            && info.run == run
+        {
+            // Merge into last part info (not strictly necessary)
 
-                    if part.len_no_space > 0.0 {
-                        info.len_no_space = info.len + part.len_no_space;
-                    }
-                    info.len += part.len;
+            if glyph_run.level.is_ltr() {
+                info.glyph_range.end = glyph_range.end;
+            } else {
+                info.offset = part.offset;
+                info.glyph_range.start = glyph_range.start;
+            }
+            debug_assert!(info.glyph_range.start <= info.glyph_range.end);
 
-                    return;
-                }
+            if part.len_no_space > 0.0 {
+                info.len_no_space = info.len + part.len_no_space;
             }
+            info.len += part.len;
+
+            return;
         }
 
         self.parts.push(PartInfo {

src/fonts/library.rs

@@ -287,13 +287,13 @@ impl FontLibrary {
 
         let faces = self.faces.read().unwrap();
 
-        if let Some(face_id) = last_face_id {
-            if font.1.contains(&face_id) {
-                let face = &faces.faces[face_id.get()];
-                // TODO(opt): should we cache this lookup?
-                if face.face.glyph_index(c).is_some() {
-                    return Ok(Some(face_id));
-                }
+        if let Some(face_id) = last_face_id
+            && font.1.contains(&face_id)
+        {
+            let face = &faces.faces[face_id.get()];
+            // TODO(opt): should we cache this lookup?
+            if face.face.glyph_index(c).is_some() {
+                return Ok(Some(face_id));
             }
         }
 
@@ -313,7 +313,7 @@ impl FontLibrary {
                 // TODO: we need some mechanism to widen the search when this
                 // fails (certain chars might only be found in a special font).
                 if id.is_none() {
-                    id = font.1.first().map(|id| *id);
+                    id = font.1.first().copied();
                 }
 
                 entry.insert(id);

src/format/markdown.rs

@@ -128,11 +128,11 @@ fn parse(input: &str) -> Result<Markdown, Error> {
     let mut fmt: Vec<Fmt> = Vec::new();
     let mut set_last = |item: &StackItem| {
         let f = Fmt::new(item);
-        if let Some(last) = fmt.last_mut() {
-            if last.start >= item.start {
-                *last = f;
-                return;
-            }
+        if let Some(last) = fmt.last_mut()
+            && last.start >= item.start
+        {
+            *last = f;
+            return;
         }
         fmt.push(f);
     };