Use clippy

fornwall · Jun 13, 2023 · 945fdb8 · 945fdb8
1 parent 33c843a
commit 945fdb8
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,6 +3,10 @@ name = "wgpu-game-of-life"
 version = "0.1.0"
 edition = "2021"
 description = "Wgpu game of life"
+license = "MIT"
+repository = "https://github.com/fornwall/wgpu-game-of-life"
+keywords = ["advent-of-code"]
+categories = ["graphics"]
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/Makefile b/Makefile
@@ -11,6 +11,36 @@ else
   WASM_OPT += -O0
 endif
 
+CLIPPY_PARAMS = --all-targets -- \
+	-W clippy::cargo \
+	-W clippy::cast_lossless \
+	-W clippy::dbg_macro \
+	-W clippy::expect_used \
+	-W clippy::manual_filter_map \
+	-W clippy::if_not_else \
+	-W clippy::items_after_statements \
+	-W clippy::large_stack_arrays \
+	-W clippy::linkedlist \
+	-W clippy::match_same_arms \
+	-W clippy::option_if_let_else \
+	-W clippy::redundant_closure_for_method_calls \
+	-W clippy::needless_continue \
+	-W clippy::needless_pass_by_value \
+	-W clippy::semicolon_if_nothing_returned \
+	-W clippy::similar_names \
+	-W clippy::single_match_else \
+	-W clippy::trivially_copy_pass_by_ref \
+	-W clippy::unreadable-literal \
+	-W clippy::unseparated-literal-suffix \
+	-W clippy::unnested_or_patterns \
+	-A clippy::wildcard_dependencies
+
+CARGO_COMMAND = cargo +nightly
+
+check:
+	$(CARGO_COMMAND) fmt --all
+	$(CARGO_COMMAND) clippy --tests $(CLIPPY_PARAMS)
+
 macos-app:
 	cargo install cargo-bundle
 	cargo bundle --release
@@ -30,3 +60,5 @@ wasm:
 	$(WASM_BINDGEN) --out-dir site/generated target/wasm32-unknown-unknown/$(WASM_DIR)/wgpu_game_of_life.wasm
 	$(WASM_OPT) -o site/generated/wgpu_game_of_life_bg.wasm site/generated/wgpu_game_of_life_bg.wasm
 	(sleep 1 && open http://localhost:8888) & cd site && python3 -m http.server 8888
+
+.PHONY: check macos-app run-app wasm
diff --git a/src/event_loop.rs b/src/event_loop.rs
@@ -1,14 +1,14 @@
 use winit::{
-    event::{ElementState, Event, KeyboardInput, StartCause, VirtualKeyCode, WindowEvent},
+    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
     event_loop::ControlFlow,
 };
 
 use crate::State;
 
-pub fn handle_event_loop(event: Event<()>, state: &mut State, control_flow: &mut ControlFlow) {
+pub fn handle_event_loop(event: &Event<()>, state: &mut State, control_flow: &mut ControlFlow) {
     // *control_flow = ControlFlow::WaitUntil(Instant::now().add(Duration::from_millis(1000)));
     match event {
-        Event::WindowEvent {
+        &Event::WindowEvent {
             ref event,
             window_id,
         } if window_id == state.window.id() => {
@@ -47,7 +47,7 @@ pub fn handle_event_loop(event: Event<()>, state: &mut State, control_flow: &mut
             }
         }
 
-        Event::RedrawRequested(window_id) if window_id == state.window.id() => {
+        &Event::RedrawRequested(window_id) if window_id == state.window.id() => {
             state.update();
             match state.render() {
                 Ok(_) => {}
@@ -59,16 +59,16 @@ pub fn handle_event_loop(event: Event<()>, state: &mut State, control_flow: &mut
                 Err(e) => eprintln!("{:?}", e),
             }
         }
-        Event::NewEvents(StartCause::Init) => {
-            // From the winit README:
-            // "A lot of functionality expects the application to be ready before you start doing anything;
-            // this includes creating windows, fetching monitors, drawing, and so on, see issues #2238, #2051
-            // and #2087.
-            // If you encounter problems, you should try doing your initialization inside
-            // Event::NewEvents(StartCause::Init)."
-            //state .window .set_fullscreen(Some(winit::window::Fullscreen::Borderless(None)));
-            //state.window.focus_window();
-        }
+        //Event::NewEvents(StartCause::Init) => {
+        // From the winit README:
+        // "A lot of functionality expects the application to be ready before you start doing anything;
+        // this includes creating windows, fetching monitors, drawing, and so on, see issues #2238, #2051
+        // and #2087.
+        // If you encounter problems, you should try doing your initialization inside
+        // Event::NewEvents(StartCause::Init)."
+        //state .window .set_fullscreen(Some(winit::window::Fullscreen::Borderless(None)));
+        //state.window.focus_window();
+        //}
         Event::MainEventsCleared => {
             state.window.request_redraw();
         }

diff --git a/src/lib.rs b/src/lib.rs
@@ -60,7 +60,7 @@ pub async fn run() {
     let mut state = State::new(window).await;
 
     event_loop.run(move |event, _, control_flow| {
-        event_loop::handle_event_loop(event, &mut state, control_flow)
+        event_loop::handle_event_loop(&event, &mut state, control_flow);
     });
 }
 
@@ -119,7 +119,7 @@ impl<'a> State<'a> {
             .formats
             .iter()
             .copied()
-            .find(|f| f.is_srgb())
+            .find(wgpu::TextureFormat::is_srgb)
             .unwrap_or(surface_caps.formats[0]);
 
         let config = wgpu::SurfaceConfiguration {
@@ -369,7 +369,7 @@ impl<'a> State<'a> {
         let render_pipeline = render_pipeline_from_shader(
             &device,
             &render_pipeline_layout,
-            shader,
+            &shader,
             &config,
             cells_stride,
             square_stride,
@@ -562,7 +562,7 @@ impl<'a> State<'a> {
 fn render_pipeline_from_shader(
     device: &wgpu::Device,
     render_pipeline_layout: &wgpu::PipelineLayout,
-    shader: wgpu::ShaderModule,
+    shader: &wgpu::ShaderModule,
     config: &wgpu::SurfaceConfiguration,
     cells_stride: wgpu::VertexBufferLayout,
     square_stride: wgpu::VertexBufferLayout,
@@ -571,12 +571,12 @@ fn render_pipeline_from_shader(
         label: Some("render_pipeline"),
         layout: Some(render_pipeline_layout),
         vertex: wgpu::VertexState {
-            module: &shader,
+            module: shader,
             entry_point: "vertex_main",
             buffers: &[cells_stride, square_stride],
         },
         fragment: Some(wgpu::FragmentState {
-            module: &shader,
+            module: shader,
             entry_point: "fragment_main",
             targets: &[Some(wgpu::ColorTargetState {
                 format: config.format,