cargo fmt

Author: melted

nib-core/src/core.rs

@@ -256,7 +256,11 @@ impl DesugarState {
             }
             Pattern::Literal(lit) => {
                 // TODO: Generate appropriate check for each literal type
-                let check = app(&vec![var(&Symbol::from("_prim_eq")), expr.clone(), literal(lit)]);
+                let check = app(&vec![
+                    var(&Symbol::from("_prim_eq")),
+                    expr.clone(),
+                    literal(lit),
+                ]);
                 Ok(vec![PatternParts::Check(check)])
             }
             Pattern::Typed(pat, typ) => {
@@ -268,14 +272,18 @@ impl DesugarState {
                     }
                 }
                 let get_type = app(&vec![var(&Symbol::from("_prim_type")), val]);
-                let check = app(&vec![var(&Symbol::from("_prim_eq")), get_type, name_expr(typ)]);
+                let check = app(&vec![
+                    var(&Symbol::from("_prim_eq")),
+                    get_type,
+                    name_expr(typ),
+                ]);
                 inner.push(PatternParts::Check(check));
                 Ok(inner)
             }
-            Pattern::Var(Name::Plain(name)) => Ok(vec![PatternParts::Bind(name.clone(), expr.clone())]),
-            Pattern::Var(_) => {
-                self.error("Qualified name in arg pattern")
+            Pattern::Var(Name::Plain(name)) => {
+                Ok(vec![PatternParts::Bind(name.clone(), expr.clone())])
             }
+            Pattern::Var(_) => self.error("Qualified name in arg pattern"),
             Pattern::Wildcard => Ok(vec![]),
         }
     }
@@ -872,8 +880,9 @@ pub fn rename(expr: &Expression, old_name: &Var, new_name: &Var) -> Expression {
                 new_binding.body = new_body;
                 new_defs.push(new_binding);
                 if let Var::Named(n) = old_name {
-                    if let Some(Name::Plain(x)) = &b.name &&
-                        n == x {
+                    if let Some(Name::Plain(x)) = &b.name
+                        && n == x
+                    {
                         shadowed = true;
                     }
                 }

nib-core/src/interpreter/compile.rs

@@ -1,5 +1,5 @@
-use crate::common::{Result, Symbol};
 use crate::common::{Metadata, Name};
+use crate::common::{Result, Symbol};
 use crate::core::Binder;
 use crate::interpreter::heap::Value;
 use std::collections::HashMap;

nib-core/src/parser/tests.rs

@@ -17,7 +17,10 @@ fn lex_numbers() -> Result<()> {
 fn lex_identifier() -> Result<()> {
     let tokens = lex("hello_world aaa bbb ccc")?;
     assert_eq!(tokens.len(), 5);
-    assert_eq!(tokens[0], TokenValue::Identifier(Symbol::from("hello_world")));
+    assert_eq!(
+        tokens[0],
+        TokenValue::Identifier(Symbol::from("hello_world"))
+    );
     Ok(())
 }
 

nib-core/src/treewalker.rs

@@ -46,7 +46,7 @@ impl Runtime {
             globals: new_ref(Table::new()),
             local_module: None,
             closures_to_check: HashMap::new(),
-            output_core: false
+            output_core: false,
         };
 
         rt.register_type_tables();
@@ -91,7 +91,7 @@ impl Runtime {
         })
     }
 
-    pub fn set_output_core(&mut self, output:bool) {
+    pub fn set_output_core(&mut self, output: bool) {
         self.output_core = output;
     }
 
@@ -103,7 +103,6 @@ impl Runtime {
         self.add_to_table(self.globals.clone(), &sym, &value);
     }
 
-
     pub fn delete_global(&mut self, name: &Symbol) {
         self.globals.borrow_mut().table.remove(name);
     }
@@ -117,11 +116,7 @@ impl Runtime {
     }
 
     pub fn get_global(&self, name: &Symbol) -> Option<Value> {
-        self.globals
-            .borrow()
-            .table
-            .get(name)
-            .cloned()
+        self.globals.borrow().table.get(name).cloned()
     }
 
     pub fn add_name(&mut self, name: &Name, val: &Value) -> Result<()> {

nib-core/src/treewalker/evaluate.rs

@@ -44,9 +44,7 @@ impl Runtime {
         for v in vals {
             eval_status.value_stack.push(v.clone());
         }
-        eval_status
-            .work_stack
-            .push(EvalStep::Apply(None, size));
+        eval_status.work_stack.push(EvalStep::Apply(None, size));
         self.eval(&mut eval_status, &mut env)?;
         Ok(eval_status.value_stack.pop().unwrap_or(Value::Nil))
     }
@@ -253,10 +251,7 @@ impl Runtime {
             Expression::Cond(_, cond) => {
                 eval_status.work_stack.push(EvalStep::Select(
                     Box::new(EvalStep::Expression(binding_name.clone(), cond.if_true)),
-                    Box::new(EvalStep::Expression(
-                        binding_name.clone(),
-                        cond.if_false,
-                    )),
+                    Box::new(EvalStep::Expression(binding_name.clone(), cond.if_false)),
                 ));
                 eval_status
                     .work_stack
@@ -295,7 +290,7 @@ impl Runtime {
         eval_status: &mut EvalStatus,
         vals: &[Value],
         current_env: &mut Environment,
-        binding_name: &Option<Name>
+        binding_name: &Option<Name>,
     ) -> Result<()> {
         info!("Applying {} to {} arguments", &vals[0], &vals[1..].len());
         match &vals[0] {
@@ -346,10 +341,9 @@ impl Runtime {
                         }
                         mem::swap(&mut env, current_env);
                         eval_status.work_stack.push(EvalStep::ReplaceEnv(env));
-                        eval_status.work_stack.push(EvalStep::Expression(
-                            binding_name.clone(),
-                            lam.body.clone(),
-                        ));
+                        eval_status
+                            .work_stack
+                            .push(EvalStep::Expression(binding_name.clone(), lam.body.clone()));
                         None
                     }
                     Code::ExternSimple(ext) => Some(ext(&args)?),