Formatting code

service/src/bot/commands/roll.rs

@@ -1,6 +1,12 @@
 use log::{error, warn};
 use rand::Rng;
-use serenity::{builder::CreateApplicationCommand, client::Context, model::application::{command::CommandOptionType, interaction::application_command::ApplicationCommandInteraction}};
+use serenity::{
+  builder::CreateApplicationCommand,
+  client::Context,
+  model::application::{
+    command::CommandOptionType, interaction::application_command::ApplicationCommandInteraction,
+  },
+};
 
 use crate::bot::commands::audio::edit_response;
 
@@ -49,10 +55,17 @@ pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
         total += roll;
         rolls.push(roll);
       }
-      let response = format!("{}d{}{} = {}",
+      let response = format!(
+        "{}d{}{} = {}",
         count,
-        sides, 
-        if modifier > 0 { format!("+{}", modifier) } else if modifier < 0 { format!("-{}", modifier) } else { "".to_string() },
+        sides,
+        if modifier > 0 {
+          format!("+{}", modifier)
+        } else if modifier < 0 {
+          format!("-{}", modifier)
+        } else {
+          "".to_string()
+        },
         total + (modifier as u32)
       );
       if let Err(why) = edit_response(&ctx, &command, response).await {
@@ -60,13 +73,12 @@ pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
       }
     }
     Err(why) => {
-      if let Err(why) = edit_response(&ctx, &command, format!("Invalid dice string: {}", why)).await {
+      if let Err(why) = edit_response(&ctx, &command, format!("Invalid dice string: {}", why)).await
+      {
         error!("Failed to create response message: {}", why);
       }
     }
   }
-
-  
 }
 
 fn parse_dice(dice: &str) -> Result<(u32, u32, i32), String> {
@@ -74,9 +86,9 @@ fn parse_dice(dice: &str) -> Result<(u32, u32, i32), String> {
   let count = match parts.next() {
     Some(c) => match c.parse::<u32>() {
       Ok(n) => n,
-      Err(_) => return Err(format!("Invalid dice count: {}", c))
+      Err(_) => return Err(format!("Invalid dice count: {}", c)),
     },
-    None => return Err(format!("Invalid dice string: {}", dice))
+    None => return Err(format!("Invalid dice string: {}", dice)),
   };
   let mut positive_modifier = true;
   let mut parts = match parts.next() {
@@ -91,8 +103,8 @@ fn parse_dice(dice: &str) -> Result<(u32, u32, i32), String> {
       } else {
         p.split("+")
       }
-    },
-    None => return Err(format!("Invalid dice string: {}", dice))
+    }
+    None => return Err(format!("Invalid dice string: {}", dice)),
   };
   let sides = match parts.next() {
     Some(s) => match s.parse::<u32>() {
@@ -103,9 +115,9 @@ fn parse_dice(dice: &str) -> Result<(u32, u32, i32), String> {
           return Err(format!("Invalid dice sides: {}", s));
         }
       }
-      Err(_) => return Err(format!("Invalid dice sides: {}", s))
+      Err(_) => return Err(format!("Invalid dice sides: {}", s)),
     },
-    None => return Err(format!("Invalid dice string: {}", dice))
+    None => return Err(format!("Invalid dice string: {}", dice)),
   };
   let modifier = match parts.next() {
     Some(m) => match m.parse::<i32>() {
@@ -115,20 +127,23 @@ fn parse_dice(dice: &str) -> Result<(u32, u32, i32), String> {
         } else {
           n * -1
         }
-      },
-      Err(_) => return Err(format!("Invalid dice modifier: {}", m))
+      }
+      Err(_) => return Err(format!("Invalid dice modifier: {}", m)),
     },
-    None => 0
+    None => 0,
   };
   Ok((count, sides, modifier))
 }
 
 pub fn register(command: &mut CreateApplicationCommand) -> &mut CreateApplicationCommand {
-  command.name("roll").description("Rolls D&D dice").create_option(|option| {
-    option
-      .name("dice")
-      .description("Dice to roll")
-      .kind(CommandOptionType::String)
-      .required(true)
-  })
-}
+  command
+    .name("roll")
+    .description("Rolls D&D dice")
+    .create_option(|option| {
+      option
+        .name("dice")
+        .description("Dice to roll")
+        .kind(CommandOptionType::String)
+        .required(true)
+    })
+}