From 9231a8b37e97342c9e9398f7dd5cf5abc4d8e808 Mon Sep 17 00:00:00 2001 From: Dominic Date: Sat, 6 Jul 2024 22:14:48 +0200 Subject: [PATCH] fix lints --- src/activities/house/grid.rs | 2 +- src/activities/house/mod.rs | 4 ++-- src/activities/house/player.rs | 4 ++-- src/activities/{overworld.rs => overworld/mod.rs} | 4 ++-- src/activities/overworld/worldgen.rs | 3 +++ 5 files changed, 10 insertions(+), 7 deletions(-) rename src/activities/{overworld.rs => overworld/mod.rs} (84%) diff --git a/src/activities/house/grid.rs b/src/activities/house/grid.rs index 114eace..5922fd9 100644 --- a/src/activities/house/grid.rs +++ b/src/activities/house/grid.rs @@ -1,4 +1,4 @@ -use comfy::*; +use comfy::{draw_circle, draw_line, error, vec2, Vec2, BLUE}; #[derive(Debug)] pub struct Grid { diff --git a/src/activities/house/mod.rs b/src/activities/house/mod.rs index 643e666..fbcca6d 100644 --- a/src/activities/house/mod.rs +++ b/src/activities/house/mod.rs @@ -10,7 +10,7 @@ pub struct HouseState { player: Player } -pub fn draw(state: &crate::State, _engine: &comfy::EngineContext) { +pub fn draw(state: &crate::State, _engine: &comfy::EngineContext<'_>) { //Draw Grid state.house.grid.draw(); @@ -18,6 +18,6 @@ pub fn draw(state: &crate::State, _engine: &comfy::EngineContext) { state.house.player.draw(); } -pub fn update(state: &mut crate::State, _engine: &mut comfy::EngineContext) { +pub fn update(state: &mut crate::State, _engine: &mut comfy::EngineContext<'_>) { state.house.player.update(&state.house.grid); } diff --git a/src/activities/house/player.rs b/src/activities/house/player.rs index eb60107..e7bc726 100644 --- a/src/activities/house/player.rs +++ b/src/activities/house/player.rs @@ -1,6 +1,6 @@ -use comfy::*; - use super::Grid; +use comfy::{delta, draw_circle, is_key_down, vec2, KeyCode, Vec2, RED}; +use std::collections::HashSet; #[derive(Debug)] pub struct Player { diff --git a/src/activities/overworld.rs b/src/activities/overworld/mod.rs similarity index 84% rename from src/activities/overworld.rs rename to src/activities/overworld/mod.rs index cc44c13..f8bee45 100644 --- a/src/activities/overworld.rs +++ b/src/activities/overworld/mod.rs @@ -1,6 +1,6 @@ use comfy::{ - draw_circle, draw_rect_outline, draw_sprite, main_camera_mut, texture_id, vec2, - EngineContext, IVec2, Vec2, GREEN, RED, WHITE + draw_rect_outline, draw_sprite, main_camera_mut, EngineContext, IVec2, Vec2, RED, + WHITE }; use crate::game::ZLayer; diff --git a/src/activities/overworld/worldgen.rs b/src/activities/overworld/worldgen.rs index e12bd0f..427ba72 100644 --- a/src/activities/overworld/worldgen.rs +++ b/src/activities/overworld/worldgen.rs @@ -1,3 +1,6 @@ +// TODO remove this +#![allow(dead_code)] + use crate::assets::ASSETS; use comfy::{IVec2, TextureHandle, UVec2}; use log::info;