fixes and fmt

Author: NULLx76

.run/Clippy.run.xml

@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="Clippy" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+ <option name="channel" value="DEFAULT" />
+ <option name="command" value="clippy" />
+ <option name="allFeatures" value="false" />
+ <option name="emulateTerminal" value="false" />
+ <option name="backtrace" value="SHORT" />
+ <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+ <envs />
+ <method v="2">
+ <option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
+ </method>
+ </configuration>
+</component>

roll-lib/src/interpreter.rs

@@ -122,7 +122,7 @@ impl Value {
  (Value::Float(i), Value::Float(j)) => Value::Float((i as f64).powf(j as f64)),
  (Value::Int(i), Value::Float(j)) => Value::Float((i as f64).powf(j as f64)),
  (Value::Float(i), Value::Int(j)) => Value::Float((i as f64).powf(j as f64)),
- (Value::Int(i), Value::Int(j))  if j < 0 => Value::Float((i as f64).powf(j as f64)),
+ (Value::Int(i), Value::Int(j)) if j < 0 => Value::Float((i as f64).powf(j as f64)),
  (Value::Int(i), Value::Int(j)) => Value::Int((i as i64).pow(j as u32)),
  }
  }

roll-lib/src/lib.rs

@@ -4,10 +4,10 @@ mod options;
 mod parser;
 mod roll;
 
+use crate::interpreter::Ast;
 pub use crate::parser::*;
 pub use crate::roll::*;
 pub use rand_core;
-use crate::interpreter::Ast;
 use std::collections::HashMap;
 
 pub fn inplace_interp(s: &str, advanced: bool) -> String {
@@ -20,7 +20,6 @@ pub fn inplace_interp(s: &str, advanced: bool) -> String {
  Ok(i) => i,
  Err(e) => {
  panic!("{}", e);
-
  }
  };
 
@@ -34,35 +33,54 @@ pub fn inplace_interp(s: &str, advanced: bool) -> String {
  map.insert(pos, roll);
  }
 
- let res = replace_rolls(copy, &map, |roll| {
- format!("{:?}", roll.vals)
- });
+ let res = replace_rolls(copy, &map, |roll| format!("{:?}", roll.vals));
  format!("{} = {} = {}", s, res, total)
 }
 
-fn replace_rolls(ast: Ast, lookup: &HashMap<u64, Roll>, func: fn(&Roll) -> String ) -> Ast {
+fn replace_rolls(ast: Ast, lookup: &HashMap<u64, Roll>, func: fn(&Roll) -> String) -> Ast {
  return match ast {
- Ast::Add(l, r) => Ast::Add(Box::from(replace_rolls(*l, lookup, func)), Box::from(replace_rolls(*r, lookup, func))),
- Ast::Sub(l, r) => Ast::Sub(Box::from(replace_rolls(*l, lookup, func)), Box::from(replace_rolls(*r, lookup, func))),
- Ast::Mul(l, r) => Ast::Mul(Box::from(replace_rolls(*l, lookup, func)), Box::from(replace_rolls(*r, lookup, func))),
- Ast::Div(l, r) => Ast::Div(Box::from(replace_rolls(*l, lookup, func)), Box::from(replace_rolls(*r, lookup, func))),
- Ast::Mod(l, r) => Ast::Mod(Box::from(replace_rolls(*l, lookup, func)), Box::from(replace_rolls(*r, lookup, func))),
- Ast::IDiv(l, r) => Ast::IDiv(Box::from(replace_rolls(*l, lookup, func)), Box::from(replace_rolls(*r, lookup, func))),
- Ast::Power(l, r) => Ast::Power(Box::from(replace_rolls(*l, lookup, func)), Box::from(replace_rolls(*r, lookup, func))),
+ Ast::Add(l, r) => Ast::Add(
+ Box::from(replace_rolls(*l, lookup, func)),
+ Box::from(replace_rolls(*r, lookup, func)),
+ ),
+ Ast::Sub(l, r) => Ast::Sub(
+ Box::from(replace_rolls(*l, lookup, func)),
+ Box::from(replace_rolls(*r, lookup, func)),
+ ),
+ Ast::Mul(l, r) => Ast::Mul(
+ Box::from(replace_rolls(*l, lookup, func)),
+ Box::from(replace_rolls(*r, lookup, func)),
+ ),
+ Ast::Div(l, r) => Ast::Div(
+ Box::from(replace_rolls(*l, lookup, func)),
+ Box::from(replace_rolls(*r, lookup, func)),
+ ),
+ Ast::Mod(l, r) => Ast::Mod(
+ Box::from(replace_rolls(*l, lookup, func)),
+ Box::from(replace_rolls(*r, lookup, func)),
+ ),
+ Ast::IDiv(l, r) => Ast::IDiv(
+ Box::from(replace_rolls(*l, lookup, func)),
+ Box::from(replace_rolls(*r, lookup, func)),
+ ),
+ Ast::Power(l, r) => Ast::Power(
+ Box::from(replace_rolls(*l, lookup, func)),
+ Box::from(replace_rolls(*r, lookup, func)),
+ ),
  Ast::Minus(l) => Ast::Minus(Box::from(replace_rolls(*l, lookup, func))),
  Ast::Dice(_, _, _, pos) => {
  let roll = lookup.get(&pos).unwrap();
  Ast::Const(func(roll))
- },
- x@Ast::Const(_) => x
- }
+ }
+ x @ Ast::Const(_) => x,
+ };
 }
 
 #[cfg(test)]
 mod test {
+ use super::*;
  use crate::parser::Parser;
  use bnf::Grammar;
- use super::*;
 
  const GRAMMAR: &str = include_str!("../../grammar.bnf");
 
@@ -92,6 +110,6 @@ mod test {
 
  #[test]
  fn test_inplace() {
- println!("{}", inplace_interp("4d8 + 2d8"));
+ println!("{}", inplace_interp("4d8 + 2d8", false));
  }
 }

roll-lib/src/parser.rs

@@ -147,6 +147,7 @@ impl<'a> Parser<'a> {
  } else if self.accept_string("mod", options.clone()).is_ok() {
  '%'
  } else {
+ //FIXME options assigned but never read
  options = options.add_str("mod");
  options = options.add_str("//");
  break;

roll/src/main.rs

@@ -1,5 +1,5 @@
 use roll_lib::rand_core::OsRng;
-use roll_lib::{roll_direction, Parser, Roll, inplace_interp};
+use roll_lib::{inplace_interp, roll_direction, Parser, Roll};
 use std::{env, process};
 
 fn main() {
@@ -16,18 +16,16 @@ fn main() {
  let mut advanced = false;
  let mut short = false;
 
- argv.retain(|x| {
- match x.as_str() {
- "-a" => {
- advanced = true;
- false
- }
- "-s" => {
- short = true;
- false
- }
- _ => true
+ argv.retain(|x| match x.as_str() {
+ "-a" => {
+ advanced = true;
+ false
  }
+ "-s" => {
+ short = true;
+ false
+ }
+ _ => true,
  });
 
  if short {
@@ -67,8 +65,6 @@ fn dice_roller(s: &str, advanced: bool) {
  }
  };
 
- println!("ast : {}\n", ast);
-
  let mut rolls = Vec::new();
  let total = match ast.interp(&mut rolls) {
  Ok(i) => i,

wasm/src/lib.rs

@@ -1,6 +1,6 @@
 use roll_lib::Parser;
-use serde::Serialize;
 use serde::Deserialize;
+use serde::Serialize;
 use wasm_bindgen::prelude::*;
 
 // to build: wasm-pack build --target web
@@ -18,13 +18,13 @@ pub fn init_console() {
  console_error_panic_hook::set_once();
 }
 
-#[derive(Debug,PartialEq,Serialize,Deserialize)]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub enum ObjType {
  JsRoll,
  JsRolls,
 }
 
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub struct JsRoll {
  #[serde(rename = "type")]
  pub obj_type: ObjType,
@@ -34,7 +34,7 @@ pub struct JsRoll {
  pub dpos: u64,
 }
 
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub struct JsRolls {
  #[serde(rename = "type")]
  pub obj_type: ObjType,