fix clippy

Author: Firestar99

shared/src/lib.rs

@@ -31,7 +31,7 @@ pub struct ShaderConstants {
 }
 
 pub fn saturate(x: f32) -> f32 {
-    x.max(0.0).min(1.0)
+    x.clamp(0.0, 1.0)
 }
 
 /// Based on: https://seblagarde.wordpress.com/2014/12/01/inverse-trigonometric-functions-gpu-optimization-for-amd-gcn-architecture/
@@ -62,16 +62,6 @@ pub fn mix<X: Copy + Mul<A, Output = X> + Add<Output = X> + Sub<Output = X>, A:
     x - x * a + y * a
 }
 
-pub trait Clamp {
-    fn clamp(self, min: Self, max: Self) -> Self;
-}
-
-impl Clamp for f32 {
-    fn clamp(self, min: Self, max: Self) -> Self {
-        self.max(min).min(max)
-    }
-}
-
 pub trait FloatExt {
     fn fract_gl(self) -> Self;
     fn rem_euclid(self, rhs: Self) -> Self;
@@ -232,5 +222,5 @@ impl VecExt for Vec4 {
 }
 
 pub fn discard() {
-    unsafe { spirv_std::arch::demote_to_helper_invocation() }
+    spirv_std::arch::demote_to_helper_invocation()
 }

src/main.rs

@@ -199,7 +199,7 @@ impl ShaderToyApp {
         let frame = match surface.get_current_texture() {
             Ok(frame) => frame,
             Err(e) => {
-                eprintln!("Failed to acquire texture: {:?}", e);
+                eprintln!("Failed to acquire texture: {e:?}");
                 return;
             }
         };
@@ -306,11 +306,9 @@ impl ApplicationHandler for ShaderToyApp {
                     }
                 }
             }
-            WindowEvent::MouseWheel { delta, .. } => {
-                if let winit::event::MouseScrollDelta::LineDelta(x, y) = delta {
-                    self.drag_end_x = x * 0.1;
-                    self.drag_end_y = y * 0.1;
-                }
+            WindowEvent::MouseWheel { delta: winit::event::MouseScrollDelta::LineDelta(x, y), .. } => {
+                self.drag_end_x = x * 0.1;
+                self.drag_end_y = y * 0.1;
             }
             WindowEvent::KeyboardInput { event, .. } => {
                 if event.logical_key == NamedKey::Escape && event.state == ElementState::Pressed {