From 0c901a4f10a0579623da467ebdf018796c800aca Mon Sep 17 00:00:00 2001
From: Bernie Innocenti <bernie@codewiz.org>
Date: Thu, 29 Jun 2017 06:51:38 -0400
Subject: [PATCH] Fix style warnings from clippy.

---
 bounding_box.rs | 4 ++--
 main.rs         | 8 ++++----
 mandelwow.rs    | 6 +++---
 shaded_cube.rs  | 4 ++--
 sound.rs        | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bounding_box.rs b/bounding_box.rs
index ce06b52..d5fa413 100644
--- a/bounding_box.rs
+++ b/bounding_box.rs
@@ -6,7 +6,7 @@ use glium::index::{IndexBuffer, PrimitiveType};
 pub fn solid_fill_program(display: &Display) -> Program {
     let vertex_shader_src = include_str!("solid.vert");
     let fragment_shader_src = include_str!("solid.frag");
-    return Program::from_source(display, vertex_shader_src, fragment_shader_src, None).unwrap();
+    Program::from_source(display, vertex_shader_src, fragment_shader_src, None).unwrap()
 }
 
 #[derive(Copy, Clone)]
@@ -54,6 +54,6 @@ impl<'a> BoundingBox<'a> {
             blend: glium::Blend::alpha_blending(),
             ..Default::default()
         };
-        frame.draw(&self.vertexes, &self.indices, &self.program, uniforms, &params).unwrap();
+        frame.draw(&self.vertexes, &self.indices, self.program, uniforms, &params).unwrap();
     }
 }
diff --git a/main.rs b/main.rs
index c673e02..d5f7378 100644
--- a/main.rs
+++ b/main.rs
@@ -70,7 +70,7 @@ fn main() {
         .with_depth_buffer(24)
         .with_vsync()
         .with_srgb(Some(true))
-        .with_title(format!("MandelWow"))
+        .with_title("MandelWow")
         .build_glium()
         //.build_glium_debug(glium::debug::DebugCallbackBehavior::PrintAll)
         .unwrap();
@@ -131,7 +131,7 @@ fn main() {
     let mut hit_time = 0.0f32;
     set_main_loop_callback(|| {
         let new_hit = sound::hit_event(&mut soundplayer);
-        if new_hit != last_hit {
+        if new_hit > last_hit {
             hit_time = t;
         }
         last_hit = new_hit;
@@ -176,8 +176,8 @@ fn main() {
 
         for x in 0..SEA_XSIZE {
             for z in 0..SEA_ZSIZE {
-                let wave = (((x as f32 / SEA_XSIZE as f32 * PI * 5.0 + t * 2.0)).sin() +
-                            ((z as f32 / SEA_ZSIZE as f32 * PI * 3.0 + t * 3.0)).sin()) * 0.3;
+                let wave = ((x as f32 / SEA_XSIZE as f32 * PI * 5.0 + t * 2.0).sin() +
+                            (z as f32 / SEA_ZSIZE as f32 * PI * 3.0 + t * 3.0).sin()) * 0.3;
                 let model = Matrix4::from_translation(sea[x][z] + Vector3 {x: 0., y: wave, z: 0.});
                 let uniforms = uniform! {
                     model: array4x4(model),
diff --git a/mandelwow.rs b/mandelwow.rs
index 8e759ef..e5c883a 100644
--- a/mandelwow.rs
+++ b/mandelwow.rs
@@ -29,11 +29,11 @@ fn mand(cx: f32, cy: f32) -> [f32; 3] {
 */
 
 pub fn program(display: &glium::Display) -> glium::Program {
-    return program!(display,
+    program!(display,
         100 => {
             vertex: include_str!("mandelwow.vert"),
             fragment: include_str!("mandelwow.frag"),
-        }).unwrap();
+        }).unwrap()
 }
 
 fn mandel<U>(display: &glium::Display,
@@ -129,6 +129,6 @@ pub fn draw(display: &glium::Display,
             perspective: camera.get_perspective(),
         };
 
-        mandel(&display, &mut frame, &program, &uniforms, bounds, z0);
+        mandel(display, &mut frame, program, &uniforms, bounds, z0);
     }
 }
diff --git a/shaded_cube.rs b/shaded_cube.rs
index 560256f..eec0d16 100644
--- a/shaded_cube.rs
+++ b/shaded_cube.rs
@@ -5,7 +5,7 @@ use glium::index::{IndexBuffer, PrimitiveType};
 pub fn shaded_program(display: &Display) -> Program {
     let vertex_shader_src = include_str!("shaded.vert");
     let fragment_shader_src = include_str!("shaded.frag");
-    return Program::from_source(display, vertex_shader_src, fragment_shader_src, None).unwrap();
+    Program::from_source(display, vertex_shader_src, fragment_shader_src, None).unwrap()
 }
 
 #[derive(Copy, Clone)]
@@ -71,6 +71,6 @@ impl<'a> ShadedCube<'a> {
             backface_culling: glium::draw_parameters::BackfaceCullingMode::CullClockwise,
             ..Default::default()
         };
-        frame.draw(&self.vertexes, &self.indices, &self.program, uniforms, &params).unwrap();
+        frame.draw(&self.vertexes, &self.indices, self.program, uniforms, &params).unwrap();
     }
 }
diff --git a/sound.rs b/sound.rs
index ca313b8..9f116ad 100644
--- a/sound.rs
+++ b/sound.rs
@@ -33,7 +33,7 @@ fn play_xm(raw_xm: &[u8]) -> SoundPlayer {
         samples: Some(4096),  // 85ms
     };
     let device = sdl_audio.open_playback(None, &desired_spec, |actual_spec| {
-        let xm = XMContext::new(&raw_xm, actual_spec.freq as u32).unwrap();
+        let xm = XMContext::new(raw_xm, actual_spec.freq as u32).unwrap();
 
         XmCallback {
             xm: xm,
@@ -59,7 +59,7 @@ pub fn start() -> SoundPlayer {
             println!("Couldn't open module {}: {:?}", filename, err);
         },
     }
-    return SoundPlayer { device: None };
+    SoundPlayer { device: None }
 }
 
 pub fn hit_event(player: &mut SoundPlayer) -> f32 {
@@ -68,5 +68,5 @@ pub fn hit_event(player: &mut SoundPlayer) -> f32 {
     let xm_callback = audio_device_lock.deref();
     let xm = &xm_callback.xm;
     let n_samples = xm.latest_trigger_of_instrument(0x1D);
-    return n_samples as f32 / SAMPLE_RATE as f32;
+    n_samples as f32 / SAMPLE_RATE as f32
 }
-- 
2.25.1