Browse Source

cargo fmt

Getty Ritter 1 year ago
parent
commit
24fb60ac93
2 changed files with 13 additions and 4 deletions
  1. 6 2
      src/builtins.rs
  2. 7 2
      src/interp.rs

+ 6 - 2
src/builtins.rs

@@ -30,7 +30,9 @@ pub fn builtins() -> Vec<BuiltinFunc> {
                 |state: &State, exprs: &[ExprRef], env: &Env| -> Result<Value, MatzoError> {
                     if let [rep, expr] = exprs {
                         let mut buf = String::new();
-                        let num = state.eval(*rep, env)?.as_num(&state.ast.borrow(), rep.span)?;
+                        let num = state
+                            .eval(*rep, env)?
+                            .as_num(&state.ast.borrow(), rep.span)?;
                         for _ in 0..num {
                             buf.push_str(
                                 state
@@ -242,7 +244,9 @@ pub fn builtins() -> Vec<BuiltinFunc> {
                     if let [tup, idx, new] = exprs {
                         let tup_val = state.eval(*tup, env)?;
                         let tup = tup_val.as_tup(&state.ast.borrow(), tup.span)?;
-                        let idx = state.eval(*idx, env)?.as_num(&state.ast.borrow(), idx.span)?;
+                        let idx = state
+                            .eval(*idx, env)?
+                            .as_num(&state.ast.borrow(), idx.span)?;
 
                         let mut modified = Vec::with_capacity(tup.len());
                         for i in 0..idx {

+ 7 - 2
src/interp.rs

@@ -72,7 +72,10 @@ impl Value {
         match self {
             Value::Closure(closure) => Ok(closure),
             _ => self.with_str(ast, |s| {
-                return Err(MatzoError::new(span, format!("Expected closure, got {}", s)));
+                return Err(MatzoError::new(
+                    span,
+                    format!("Expected closure, got {}", s),
+                ));
             }),
         }
     }
@@ -550,7 +553,9 @@ impl State {
             // for a range, choose randomly between the start and end
             // expressions
             Expr::Range(from, to) => {
-                let from = self.eval(*from, env)?.as_num(&self.ast.borrow(), from.span)?;
+                let from = self
+                    .eval(*from, env)?
+                    .as_num(&self.ast.borrow(), from.span)?;
                 let to = self.eval(*to, env)?.as_num(&self.ast.borrow(), to.span)?;
                 Ok(Value::Lit(Literal::Num(
                     self.rand.borrow_mut().gen_range_i64(from, to + 1),