chore: update deps

and fix deprecated items used in pest

Author: Geobert Quach

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.2.3
+- Upgrade dependencies
+- Port code to pest 2.4 (`prec_climber` being deprecated)
+
 # 4.2.2
 - FIX: Panic when parsing "+ 3" .
 - FIX: OOM error on too big numbers. We now limit to 5000 dices of 5000 sides.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "caith"
-version = "4.2.2"
+version = "4.2.3"
 authors = ["Geobert Quach <geobert@protonmail.com>"]
 edition = "2018"
 description = "A dice roller library supporting many features"
@@ -20,12 +20,12 @@ maintenance = { status = "actively-developed" }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-pest = "2.1.3"
-pest_derive = "2.1.0"
-rand = "0.8.4"
+pest = "2.4.1"
+pest_derive = "2.4.1"
+rand = "0.8.5"
 
 [dev-dependencies]
-rand_core = "0.6.3"
+rand_core = "0.6.4"
 
 [features]
 default = []

src/error.rs

@@ -9,7 +9,7 @@ pub type Result<T> = std::result::Result<T, RollError>;
 #[derive(Debug)]
 pub enum RollError {
     /// Error while parsing the expression, emitted by `pest`
-    ParseError(pest::error::Error<Rule>),
+    ParseError(Box<pest::error::Error<Rule>>),
     /// Any other error while walking the AST, the String contains an explaination of what happened
     ParamError(String),
 }
@@ -27,7 +27,7 @@ impl Error for RollError {}
 
 impl From<pest::error::Error<Rule>> for RollError {
     fn from(e: pest::error::Error<Rule>) -> Self {
-        RollError::ParseError(e)
+        RollError::ParseError(Box::new(e))
     }
 }
 

src/helpers/cde.rs

@@ -169,7 +169,7 @@ impl Display for CdeResult {
 Loksyu ({}): {} ● Yin / {} ○ Yang
 Tin Ji ({}): {}
 "#,
-            self.history.as_ref().unwrap().to_string(),
+            self.history.as_ref().unwrap(),
             prefixes[0],
             self.elements[0],
             self.success,

src/parser.rs

@@ -2,7 +2,7 @@ use std::sync::{Arc, Once, RwLock};
 
 use pest::{
     iterators::{Pair, Pairs},
-    prec_climber::{Assoc, Operator, PrecClimber},
+    pratt_parser::PrattParser,
 };
 use pest_derive::Parser;
 
@@ -41,17 +41,22 @@ struct OptionResult {
 // Struct to have a singleton of PrecClimber without using once_cell
 #[derive(Clone)]
 struct Climber {
-    inner: Arc<RwLock<PrecClimber<Rule>>>,
+    inner: Arc<RwLock<PrattParser<Rule>>>,
 }
 
 impl Climber {
     fn climb<'i, P, F, G, T>(&self, pairs: P, primary: F, infix: G) -> T
     where
         P: Iterator<Item = Pair<'i, Rule>>,
         F: FnMut(Pair<'i, Rule>) -> T,
-        G: FnMut(T, Pair<'i, Rule>, T) -> T,
+        G: FnMut(T, Pair<'i, Rule>, T) -> T + 'i,
     {
-        self.inner.read().unwrap().climb(pairs, primary, infix)
+        self.inner
+            .read()
+            .unwrap()
+            .map_primary(primary)
+            .map_infix(infix)
+            .parse(pairs)
     }
 }
 
@@ -61,15 +66,15 @@ fn get_climber() -> Climber {
 
     unsafe {
         ONCE.call_once(|| {
-            use self::Assoc::*;
-            use self::Rule::*;
+            use pest::pratt_parser::{Assoc, Op};
 
             // Make it
             let singleton = Climber {
-                inner: Arc::new(RwLock::new(PrecClimber::new(vec![
-                    Operator::new(add, Left) | Operator::new(sub, Left),
-                    Operator::new(mul, Left) | Operator::new(div, Left),
-                ]))),
+                inner: Arc::new(RwLock::new(
+                    PrattParser::new()
+                        .op(Op::infix(Rule::add, Assoc::Left) | Op::infix(Rule::sub, Assoc::Left))
+                        .op(Op::infix(Rule::mul, Assoc::Left) | Op::infix(Rule::div, Assoc::Left)),
+                )),
             };
 
             // Put it in the heap so it can outlive this call