Clippy tweaks

Author: dhardy

src/display/glyph_pos.rs

@@ -5,11 +5,6 @@
 
 //! Methods using positioned glyphs
 
-#![allow(clippy::collapsible_else_if)]
-#![allow(clippy::or_fun_call)]
-#![allow(clippy::never_loop)]
-#![allow(clippy::needless_range_loop)]
-
 use super::{Line, TextDisplay};
 use crate::conv::to_usize;
 use crate::fonts::{self, FaceId};
@@ -407,7 +402,7 @@ impl TextDisplay {
             }
 
             // else: index < to_usize(run_part.text_end)
-            let pos = 'b: loop {
+            let pos = 'b: {
                 if glyph_run.level.is_ltr() {
                     for glyph in glyph_run.glyphs[run_part.glyph_range.to_std()].iter().rev() {
                         if to_usize(glyph.index) <= index {
@@ -623,7 +618,7 @@ impl TextDisplay {
                 .scale_by_dpu(glyph_run.dpu);
 
             let b;
-            'c: loop {
+            'c: {
                 if glyph_run.level.is_ltr() {
                     for glyph in glyph_run.glyphs[run_part.glyph_range.to_std()].iter().rev() {
                         if to_usize(glyph.index) <= range.end {

src/display/text_runs.rs

@@ -5,8 +5,6 @@
 
 //! Text preparation: line breaking and BIDI
 
-#![allow(clippy::unnecessary_unwrap)]
-
 use super::TextDisplay;
 use crate::conv::{to_u32, to_usize};
 use crate::fonts::{self, FaceId, FontSelector, NoFontMatch};
@@ -362,7 +360,7 @@ impl TextDisplay {
             }
         }
 
-        let hard_break = ends_with_hard_break(&text);
+        let hard_break = ends_with_hard_break(text);
 
         // Following a hard break we have an implied empty line.
         if hard_break {
@@ -435,6 +433,7 @@ enum EmojiBreak {
     Error,
 }
 
+#[allow(clippy::upper_case_acronyms)]
 enum EmojiState {
     None,
     RI1,

src/fonts/library.rs

@@ -5,8 +5,6 @@
 
 //! Font library
 
-#![allow(clippy::len_without_is_empty)]
-
 use super::{FaceRef, FontSelector, Resolver};
 use crate::conv::{to_u32, to_usize};
 use fontique::{Blob, QueryStatus, Script, Synthesis};

src/shaper.rs

@@ -309,7 +309,7 @@ pub(crate) fn shape(
         face_id,
         special,
         level: input.level,
-        script: input.script.into(),
+        script: input.script,
 
         glyphs,
         breaks,

src/util.rs

@@ -79,7 +79,7 @@ impl<'a> Iterator for LineIterator<'a> {
     type Item = Range<usize>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        while let Some(index) = self.break_iter.next() {
+        for index in self.break_iter.by_ref() {
             if ends_with_hard_break(&self.text[..index]) || index == self.text.len() {
                 let range = self.start..index;
                 self.start = index;