From 6c6eb5572b869e3199adc560b101fa663c01b5d2 Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 18 Nov 2022 22:10:34 -0600 Subject: clippy + replace some printlns with debug --- Cargo.lock | 1 + azalea/Cargo.toml | 1 + azalea/src/pathfinder/mod.rs | 7 ++++--- bot/src/main.rs | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f97c3e2a..8d8b68e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,6 +120,7 @@ dependencies = [ "azalea-protocol", "azalea-world", "env_logger", + "log", "num-traits", "parking_lot", "priority-queue", diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml index 846abad5..aac249c8 100755 --- a/azalea/Cargo.toml +++ b/azalea/Cargo.toml @@ -17,6 +17,7 @@ azalea-core = {version = "0.3.0", path = "../azalea-core"} azalea-physics = { version = "0.3.0", path = "../azalea-physics" } azalea-protocol = {version = "0.3.0", path = "../azalea-protocol"} azalea-world = { version = "0.3.0", path = "../azalea-world" } +log = "0.4.17" num-traits = "0.2.15" parking_lot = {version = "^0.12.1", features = ["deadlock_detection"]} priority-queue = "1.3.0" diff --git a/azalea/src/pathfinder/mod.rs b/azalea/src/pathfinder/mod.rs index 6f31512e..f119c645 100644 --- a/azalea/src/pathfinder/mod.rs +++ b/azalea/src/pathfinder/mod.rs @@ -6,6 +6,7 @@ use crate::{Client, Event}; use async_trait::async_trait; use azalea_core::{BlockPos, CardinalDirection}; use azalea_world::entity::EntityData; +use log::debug; use mtdstarlite::Edge; pub use mtdstarlite::MTDStarLite; use parking_lot::Mutex; @@ -47,7 +48,7 @@ impl Trait for azalea_client::Client { vertical_vel: VerticalVel::None, }; let end = goal.goal_node(); - println!("start: {:?}, end: {:?}", start, end); + debug!("start: {start:?}, end: {end:?}"); let possible_moves: Vec<&dyn moves::Move> = vec![ &moves::ForwardMove(CardinalDirection::North), @@ -96,8 +97,8 @@ impl Trait for azalea_client::Client { let start = std::time::Instant::now(); let p = pf.find_path(); let end = std::time::Instant::now(); - println!("path: {:?}", p); - println!("time: {:?}", end - start); + debug!("path: {p:?}"); + debug!("time: {:?}", end - start); let state = self .plugins diff --git a/bot/src/main.rs b/bot/src/main.rs index dd542a1c..942868e2 100755 --- a/bot/src/main.rs +++ b/bot/src/main.rs @@ -25,7 +25,7 @@ async fn main() -> anyhow::Result<()> { println!("{} deadlocks detected", deadlocks.len()); for (i, threads) in deadlocks.iter().enumerate() { - println!("Deadlock #{}", i); + println!("Deadlock #{i}"); for t in threads { println!("Thread Id {:#?}", t.thread_id()); println!("{:#?}", t.backtrace()); @@ -46,7 +46,7 @@ async fn main() -> anyhow::Result<()> { handle, }) .await; - println!("{:?}", e); + println!("{e:?}"); } } -- cgit v1.2.3