From d8724eb4b75d8ebaa5296069220d8ea555c4b52a Mon Sep 17 00:00:00 2001 From: Roman Godmaire Date: Mon, 6 May 2024 22:36:06 -0400 Subject: [PATCH] refactor: merge imports --- mute-interpreter/src/evaluator.rs | 10 +++------- mute-interpreter/src/node.rs | 3 +-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/mute-interpreter/src/evaluator.rs b/mute-interpreter/src/evaluator.rs index f021e23..ada604a 100644 --- a/mute-interpreter/src/evaluator.rs +++ b/mute-interpreter/src/evaluator.rs @@ -1,10 +1,6 @@ use std::borrow::Borrow; -use crate::Result; - -use crate::env::Environment; -use crate::error::Error; -use crate::Node; +use crate::{Environment, Error, Node, Result}; pub fn eval(env: &Environment, ast: Vec) -> Result> { let mut exprs = Vec::new(); @@ -205,7 +201,7 @@ mod test { dbg!(input); let env = Environment::default(); let ast = parse_str(input).unwrap(); - let res = eval(&env, ast) + let res = crate::eval(&env, ast) .unwrap() .into_iter() .map(|elem| elem.to_string()) @@ -222,7 +218,7 @@ mod test { fn test_evaluator_fail(#[case] input: &str) { let env = Environment::default(); let ast = parse_str(input).unwrap(); - let res = eval(&env, ast); + let res = crate::eval(&env, ast); assert!(res.is_err()) } diff --git a/mute-interpreter/src/node.rs b/mute-interpreter/src/node.rs index 5ace2fe..8cc34b6 100644 --- a/mute-interpreter/src/node.rs +++ b/mute-interpreter/src/node.rs @@ -1,7 +1,6 @@ use std::collections::HashMap; -use crate::Environment; -use crate::Result; +use crate::{Environment, Result}; #[derive(Debug, Clone)] pub enum Node {