From 8b2ccf363ac6894c21e256844948c8327645f0db Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Sun, 17 Nov 2019 22:51:59 -0500 Subject: mostly fixed --- src/commands/roll.rs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/commands/roll.rs') diff --git a/src/commands/roll.rs b/src/commands/roll.rs index 3df91d0..1544654 100644 --- a/src/commands/roll.rs +++ b/src/commands/roll.rs @@ -1,12 +1,23 @@ use std::result::Result as StdResult; +use log::{ + debug, + error, +}; use rand::prelude::*; use serenity::{ - framework::standard::Args, + framework::standard::{ + Args, + CommandResult, + macros::command, + }, model::channel::Message, prelude::*, }; use statrs; +use thiserror::Error; + +use lazy_static::lazy_static; use crate::{ Result, @@ -198,7 +209,7 @@ mod test { #[command] #[aliases("calc", "calculate")] -pub fn roll(ctx: &mut Context, msg: &Message, args: Args) -> Result<()> { +pub fn roll(ctx: &mut Context, msg: &Message, args: Args) -> CommandResult { match Calc::eval(args.rest()) { Ok(result) => { debug!("got calc result '{}'", result); -- cgit v1.3.1