Fix 1.97 lints

Author: alexheretic

draw-cache/benches/draw_cache.rs

@@ -95,8 +95,8 @@ fn bench_high_position_tolerance(c: &mut Criterion) {
         let glyphs = test_glyphs(&FONTS[font_id], TEST_STR);
         let mut cache = DrawCache::builder()
             .dimensions(1024, 1024)
-            .scale_tolerance(0.1)
-            .position_tolerance(1.0)
+            .scale_tolerance(0.1_f32)
+            .position_tolerance(1.0_f32)
             .build();
 
         {
@@ -368,8 +368,8 @@ fn bench_moving_text(c: &mut Criterion) {
 
     let mut cache = DrawCache::builder()
         .dimensions(1500, 1500)
-        .scale_tolerance(0.1)
-        .position_tolerance(0.1)
+        .scale_tolerance(0.1_f32)
+        .position_tolerance(0.1_f32)
         .build();
 
     {
@@ -510,8 +510,8 @@ fn bench_moving_text_thrashing(c: &mut Criterion) {
     // re-ordering, re-rasterization & re-uploading has to occur.
     let mut cache = DrawCache::builder()
         .dimensions(320, 320)
-        .scale_tolerance(0.1)
-        .position_tolerance(0.1)
+        .scale_tolerance(0.1_f32)
+        .position_tolerance(0.1_f32)
         .build();
 
     c.bench_function("moving_text_thrashing_v2", |b| {

draw-cache/src/lib.rs

@@ -1064,8 +1064,8 @@ mod test {
 
         let mut cache = DrawCache::builder()
             .dimensions(32, 32)
-            .scale_tolerance(0.1)
-            .position_tolerance(0.1)
+            .scale_tolerance(0.1_f32)
+            .position_tolerance(0.1_f32)
             .pad_glyphs(false)
             .build();
         let strings = [
@@ -1107,8 +1107,8 @@ mod test {
 
         let mut cache = DrawCache::builder()
             .dimensions(32, 32)
-            .scale_tolerance(0.1)
-            .position_tolerance(0.1)
+            .scale_tolerance(0.1_f32)
+            .position_tolerance(0.1_f32)
             .pad_glyphs(false)
             .build();
 
@@ -1130,8 +1130,8 @@ mod test {
         let gid = font.glyph_id('l');
 
         let cache = DrawCache::builder()
-            .scale_tolerance(0.2)
-            .position_tolerance(0.5)
+            .scale_tolerance(0.2_f32)
+            .position_tolerance(0.5_f32)
             .build();
 
         let small = gid.with_scale_and_position(9.91, point(0.0, 0.0));
@@ -1180,8 +1180,8 @@ mod test {
     fn builder_rebuild() {
         let mut cache = DrawCache::builder()
             .dimensions(32, 64)
-            .scale_tolerance(0.2)
-            .position_tolerance(0.3)
+            .scale_tolerance(0.2_f32)
+            .position_tolerance(0.3_f32)
             .pad_glyphs(false)
             .align_4x4(true)
             .multithread(true)
@@ -1195,8 +1195,8 @@ mod test {
 
         DrawCache::builder()
             .dimensions(64, 128)
-            .scale_tolerance(0.05)
-            .position_tolerance(0.15)
+            .scale_tolerance(0.05_f32)
+            .position_tolerance(0.15_f32)
             .pad_glyphs(true)
             .align_4x4(false)
             .multithread(false)
@@ -1226,8 +1226,8 @@ mod test {
 
         let mut cache = DrawCache::builder()
             .dimensions(31, 25)
-            .scale_tolerance(0.1)
-            .position_tolerance(0.1)
+            .scale_tolerance(0.1_f32)
+            .position_tolerance(0.1_f32)
             .build();
 
         let glyphs = glyph_brush_layout::Layout::default_single_line().calculate_glyphs(

gfx-glyph/examples/depth.rs

@@ -157,7 +157,7 @@ impl App {
                             Text::new("On top")
                                 .with_scale(95.0)
                                 .with_color([0.8, 0.8, 0.8, 1.0])
-                                .with_z(0.2)
+                                .with_z(0.2_f32)
                                 .with_font_id(ITALIC_FONT),
                         )
                         .with_screen_position((width / 2.0, 100.0))
@@ -173,7 +173,7 @@ impl App {
                             Text::new(&include_str!("lipsum.txt").replace("\n\n", "").repeat(10))
                                 .with_scale(30.0)
                                 .with_color([0.05, 0.05, 0.1, 1.0])
-                                .with_z(1.0),
+                                .with_z(1.0_f32),
                         )
                         .with_bounds((width, height)),
                 );

glyph-brush/src/glyph_brush/builder.rs

@@ -43,8 +43,8 @@ impl GlyphBrushBuilder<()> {
             section_hasher: DefaultSectionHasher::default(),
             draw_cache_builder: DrawCache::builder()
                 .dimensions(256, 256)
-                .scale_tolerance(0.5)
-                .position_tolerance(0.1)
+                .scale_tolerance(0.5_f32)
+                .position_tolerance(0.1_f32)
                 .align_4x4(false),
         }
     }

layout/src/lines.rs

@@ -145,7 +145,7 @@ where
             }
         }
 
-        Some(line).filter(|_| progressed)
+        progressed.then_some(line)
     }
 }