Remove all clippy lints

New SFML 3.x changes had a few "dirty" changes and let some clippy lints
in. Fixing all warnings to keep compilation clean.

Run automated clippy lint fixers to fix a lot of these warnings

Author: dogunbound

build.rs

@@ -196,9 +196,7 @@ fn main() {
     if is_windows {
         cmake.cxxflag("/std:c++17").cxxflag("/EHsc");
     }
-    if !feat_audio {
-        cmake.define("SFML_BUILD_AUDIO", "FALSE");
-    } else {
+    if feat_audio {
         // Add search path for libFLAC built by libflac-sys
         let (libogg_loc, libflac_loc) = match win_env {
             Some(WinEnv::Msvc) => {
@@ -228,6 +226,8 @@ fn main() {
             }
             (_, LinkageKind::Dynamic) => (),
         }
+    } else {
+        cmake.define("SFML_BUILD_AUDIO", "FALSE");
     }
     if !feat_window {
         cmake.define("SFML_BUILD_WINDOW", "FALSE");

examples/cursor.rs

@@ -160,7 +160,7 @@ fn main() -> SfResult<()> {
                         unsafe {
                             match Cursor::from_pixels(
                                 &pixels,
-                                Vector2::new(DRAW_GRID_WH as u32, DRAW_GRID_WH as u32),
+                                Vector2::new(u32::from(DRAW_GRID_WH), u32::from(DRAW_GRID_WH)),
                                 hotspot,
                             ) {
                                 Ok(cursor) => {
@@ -174,9 +174,7 @@ fn main() -> SfResult<()> {
                         modif = false;
                     }
                     if mouse_over(&clear_button, position) {
-                        for px in pixel_grid.iter_mut() {
-                            *px = false;
-                        }
+                        pixel_grid.fill(false);
                         modif = true;
                     }
                     if mouse_over(&hotspot_button, position) {
@@ -216,9 +214,9 @@ fn main() -> SfResult<()> {
             clear_button_highlighted = true;
         }
         // Grid interactions
-        let rela_x = mp.x - DRAW_AREA_TOPLEFT.0 as i32;
-        let rela_y = mp.y - DRAW_AREA_TOPLEFT.1 as i32;
-        let (gx, gy) = (rela_x / DRAW_CELL_WH as i32, rela_y / DRAW_CELL_WH as i32);
+        let rela_x = mp.x - i32::from(DRAW_AREA_TOPLEFT.0);
+        let rela_y = mp.y - i32::from(DRAW_AREA_TOPLEFT.1);
+        let (gx, gy) = (rela_x / i32::from(DRAW_CELL_WH), rela_y / i32::from(DRAW_CELL_WH));
         if gx >= 0 && gy >= 0 {
             if let Some(cell) = gridindex(&mut pixel_grid, gx as usize, gy as usize) {
                 if hotspot_selection {
@@ -277,7 +275,7 @@ fn main() -> SfResult<()> {
         shape.set_fill_color(Color::TRANSPARENT);
         for y in 0..DRAW_GRID_WH {
             for x in 0..DRAW_GRID_WH {
-                if hotspot.x == x as u32 && hotspot.y == y as u32 {
+                if hotspot.x == u32::from(x) && hotspot.y == u32::from(y) {
                     shape.set_outline_color(Color::RED);
                 } else {
                     shape.set_outline_color(Color::rgb(180, 180, 180));
@@ -287,10 +285,10 @@ fn main() -> SfResult<()> {
                 } else {
                     shape.set_fill_color(Color::TRANSPARENT);
                 }
-                shape.set_size((DRAW_CELL_WH as f32, DRAW_CELL_WH as f32));
+                shape.set_size((f32::from(DRAW_CELL_WH), f32::from(DRAW_CELL_WH)));
                 shape.set_position((
-                    DRAW_AREA_TOPLEFT.0 as f32 + (x as f32 * DRAW_CELL_WH as f32),
-                    DRAW_AREA_TOPLEFT.1 as f32 + (y as f32 * DRAW_CELL_WH as f32),
+                    f32::from(DRAW_AREA_TOPLEFT.0) + (f32::from(x) * f32::from(DRAW_CELL_WH)),
+                    f32::from(DRAW_AREA_TOPLEFT.1) + (f32::from(y) * f32::from(DRAW_CELL_WH)),
                 ));
                 rw.draw(&shape);
             }

examples/custom-drawable.rs

@@ -34,7 +34,7 @@ impl Drawable for Bullet<'_> {
         _: &RenderStates<'texture, 'shader, 'shader_texture>,
     ) {
         render_target.draw(&self.head);
-        render_target.draw(&self.torso)
+        render_target.draw(&self.torso);
     }
 }
 
@@ -63,7 +63,7 @@ fn main() -> SfResult<()> {
 
         window.clear(Color::BLACK);
         window.draw(&bullet);
-        window.display()
+        window.display();
     }
     Ok(())
 }

examples/custom-sound-recorder.rs

@@ -224,7 +224,7 @@ fn main() -> Result<(), Box<dyn Error>> {
                 for (i, &sample) in samp_buf.iter().enumerate() {
                     let ratio = samp_buf.len() as f32 / rw.size().x as f32;
                     rect.set_position((i as f32 / ratio, 300.0));
-                    rect.set_size((2.0, sample as f32 / 48.0));
+                    rect.set_size((2.0, f32::from(sample) / 48.0));
                     rw.draw(&rect);
                 }
             }

examples/custom-sound-stream.rs

@@ -19,7 +19,7 @@ const BUF_SIZE: usize = 2048;
 
 impl SoundStream for BitMelody {
     fn get_data(&mut self) -> (&[i16], bool) {
-        for buf_sample in self.buf.iter_mut() {
+        for buf_sample in &mut self.buf {
             self.t = self.t.wrapping_add(1);
             let t = self.t;
             let melody = b"36364689";
@@ -60,7 +60,7 @@ impl BitMelody {
         }
     }
     fn total_duration_samples(&self) -> usize {
-        (FULLVOL_DURATION + INIT_VOL as i32 * 4096) as usize
+        (FULLVOL_DURATION + i32::from(INIT_VOL) * 4096) as usize
     }
 }
 

examples/mouse.rs

@@ -1,4 +1,4 @@
-use sfml::{SfResult, graphics::*, system::*, window::*};
+use sfml::{SfResult, graphics::{RenderWindow, Font, CircleShape, Text, Transformable, RenderTarget, Color, Shape, Drawable}, system::Vector2i, window::{Style, Event, Key, VideoMode, mouse}};
 
 include!("../example_common.rs");
 

examples/opengl.rs

@@ -61,7 +61,7 @@ fn main() -> SfResult<()> {
             gl::glViewport(0, 0, window.size().x as _, window.size().y as _);
             gl::glMatrixMode(gl::GL_PROJECTION);
             gl::glLoadIdentity();
-            let ratio = (window.size().x / window.size().y) as gl::GLdouble;
+            let ratio = gl::GLdouble::from(window.size().x / window.size().y);
             gl::glFrustum(-ratio, ratio, -1., 1., 1., 500.);
             gl::glEnable(gl::GL_TEXTURE_2D);
             Texture::bind(&texture);
@@ -88,13 +88,13 @@ fn main() -> SfResult<()> {
                 3,
                 gl::GL_FLOAT,
                 5 * size_of::<gl::GLfloat>() as i32,
-                cube.as_ptr() as *const c_void,
+                cube.as_ptr().cast::<c_void>(),
             );
             gl::glTexCoordPointer(
                 2,
                 gl::GL_FLOAT,
                 5 * size_of::<gl::GLfloat>() as i32,
-                cube.as_ptr().offset(3) as *const c_void,
+                cube.as_ptr().offset(3).cast::<c_void>(),
             );
 
             // Disable normal and color vertex components

examples/pong.rs

@@ -279,7 +279,7 @@ fn main() -> SfResult<()> {
         }
 
         // Display things on screen
-        window.display()
+        window.display();
     }
     Ok(())
 }

examples/positional-audio.rs

@@ -60,7 +60,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     };
     if music.channel_count() != 1 {
         return Err("Sorry, only sounds with 1 channel are supported.".into());
-    };
+    }
     music.set_looping(true);
     music.play();
     music.set_position(Vector3::new(0., 0., 0.));

examples/shader.rs

@@ -51,7 +51,7 @@ impl Effect for Pixelate<'_> {
         self.shader
             .set_uniform_float("pixel_threshold", (x + y) / 30.0)
     }
-    fn name(&self) -> &str {
+    fn name(&self) -> &'static str {
         "pixelate"
     }
 }
@@ -112,7 +112,7 @@ impl Effect for WaveBlur<'_> {
         self.shader
             .set_uniform_float("blur_radius", (x + y) * 0.008)
     }
-    fn name(&self) -> &str {
+    fn name(&self) -> &'static str {
         "wave + blur"
     }
 }
@@ -166,7 +166,7 @@ impl Effect for StormBlink {
         self.shader
             .set_uniform_float("blink_alpha", 0.5 + (t * 3.).cos() * 0.25)
     }
-    fn name(&self) -> &str {
+    fn name(&self) -> &'static str {
         "storm + blink"
     }
 }
@@ -220,7 +220,7 @@ impl Drawable for Edge<'_> {
 impl Effect for Edge<'_> {
     fn update(&mut self, t: f32, x: f32, y: f32) -> SfResult<()> {
         self.shader
-            .set_uniform_float("edge_threshold", 1. - (x + y) / 2.)?;
+            .set_uniform_float("edge_threshold", 1. - f32::midpoint(x, y))?;
         let entities_len = self.entities.len() as f32;
 
         for (i, en) in self.entities.iter_mut().enumerate() {
@@ -238,7 +238,7 @@ impl Effect for Edge<'_> {
         self.surface.display();
         Ok(())
     }
-    fn name(&self) -> &str {
+    fn name(&self) -> &'static str {
         "edge post-effect"
     }
 }
@@ -307,7 +307,7 @@ impl Effect for Geometry<'_> {
         Ok(())
     }
 
-    fn name(&self) -> &str {
+    fn name(&self) -> &'static str {
         "Geometry Shader Billboards"
     }
 }
@@ -355,7 +355,7 @@ fn main() -> SfResult<()> {
 
     while window.is_open() {
         while let Some(event) = window.poll_event() {
-            use crate::Event::*;
+            use crate::Event::{Closed, KeyPressed};
             match event {
                 Closed => window.close(),
                 KeyPressed { code, .. } => match code {