rework to use songbird

1 files changed, 3 insertions, 3 deletions

diff --git a/src/commands/roll.rs b/src/commands/roll.rs
index 6aefe34..45e3ba8 100644
--- a/src/commands/roll.rs
+++ b/src/commands/roll.rs
@@ -56,7 +56,7 @@ impl Calc {
         use self::Rule::*;
 
         lazy_static! {
-            static ref CLIMBER: PrecClimber<self::Rule> = {
+            static ref CLIMBER: PrecClimber<Rule> = {
                 use pest::prec_climber::{
                     Assoc::*,
                     Operator,
@@ -75,7 +75,7 @@ impl Calc {
 
         let result = Calc::parse(calc, s.as_ref()).map_err(|_| CalcError::Pest)?;
 
-        fn eval_single_pair(pair: Pair<self::Rule>) -> StdResult<f64, CalcError> {
+        fn eval_single_pair(pair: Pair<Rule>) -> StdResult<f64, CalcError> {
             let result = match pair.as_rule() {
                 oct | hex | binary => {
                     let base = match pair.as_rule() {
@@ -159,7 +159,7 @@ impl Calc {
             Ok(result)
         }
 
-        fn eval_expr(p: Pairs<self::Rule>) -> StdResult<f64, CalcError> {
+        fn eval_expr(p: Pairs<Rule>) -> StdResult<f64, CalcError> {
             CLIMBER.climb(p, eval_single_pair, |lhs, op, rhs| {
                 let lhs = lhs?;
                 let rhs = rhs?;