From 32f6e72deca6c23899c93258010aaac23bc02e2a Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Tue, 8 Mar 2022 23:09:17 -0500 Subject: [PATCH] rustfmt --- src/main.rs | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/main.rs b/src/main.rs index 21b9b69..603cc8d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,9 @@ -use std::collections::HashMap; +use eyre::eyre; use serde::{Deserialize, Serialize}; use sqlx::SqlitePool; -use eyre::{eyre}; +use std::collections::HashMap; +use tokio::fs; +use tokio::sync::mpsc; #[derive(Deserialize, Debug, Serialize, Copy, Clone)] #[serde(rename_all = "lowercase")] @@ -45,7 +47,9 @@ impl TryFrom for ValidMonster { Ok(ValidMonster { id: value.id, name: value.name.clone(), - health: value.health.ok_or(eyre!("Couldn't unwrap health for {}", value.name))?, + health: value + .health + .ok_or(eyre!("Couldn't unwrap health for {}", value.name))?, attributes: value.attributes, attack_level: value.attack_level, strength_level: value.strength_level, @@ -80,18 +84,16 @@ struct Monster { defence_ranged: i32, } -use tokio::fs; -use tokio::sync::mpsc; - #[tokio::main] async fn main() -> eyre::Result<()> { let pool = SqlitePool::connect("sqlite:monsters.db").await?; let f = fs::read_to_string("monsters-complete.json").await?; - let a= serde_json::from_str::>(&f)?; + let a = serde_json::from_str::>(&f)?; - let validmonsters: Vec = a.into_iter() - .filter_map(|(_, monster)| {monster.try_into().ok()}) + let validmonsters: Vec = a + .into_iter() + .filter_map(|(_, monster)| monster.try_into().ok()) .collect(); println!("Found {} valid monsters", validmonsters.len()); @@ -100,8 +102,15 @@ async fn main() -> eyre::Result<()> { validmonsters.into_iter().for_each(|monster| { let sender = tx.clone(); match sender.send(monster.clone()) { - Ok(_) => {println!("Sent {} successfully", &monster.name)} - Err(_) => {eprintln!("{}", eyre::eyre!("Couldn't send {} successfully", &monster.name))} + Ok(_) => { + println!("Sent {} successfully", &monster.name) + } + Err(_) => { + eprintln!( + "{}", + eyre::eyre!("Couldn't send {} successfully", &monster.name) + ) + } }; }); @@ -110,7 +119,7 @@ async fn main() -> eyre::Result<()> { while let Some(monster) = rx.recv().await { println!("Writing {}", &monster.name); add_monster(&pool, &monster).await?; - }; + } Ok(()) } @@ -160,4 +169,4 @@ DO UPDATE SET .await?; Ok(()) -} \ No newline at end of file +}