Code tidyup

Author: J-Cake

src/eval/context.rs

@@ -1,7 +1,7 @@
 use crate::{
+    error::*
+    ,
     eval::globals::get_standard_globals,
-    parse::literal::Address,
-    error::*,
     eval::operators::get_standard_operators,
     eval::Object,
     parse::objects::*,

src/eval/operators.rs

@@ -1,18 +1,17 @@
 use crate::{
-    vec::Acc,
     error::*,
     eval::context::Operator,
     eval::context::OperatorBuilder,
-    eval::Object
+    eval::Object,
+    vec::Acc
 };
 use alloc::{
-    string::String,
     borrow::ToOwned,
     format,
+    string::String,
     vec,
     vec::Vec
 };
-use alloc::string::ToString;
 use core::ops::Add;
 
 pub(crate) fn get_standard_operators() -> Vec<Operator> {

src/parse/key.rs

@@ -1,8 +1,11 @@
-use alloc::format;
 use crate::parse::parser;
-use alloc::string::{String, ToString};
+use alloc::format;
+use alloc::string::String;
 use core::num::ParseIntError;
-use nom::{error::{FromExternalError, ParseError}, FindToken, IResult};
+use nom::error::FromExternalError;
+use nom::error::ParseError;
+use nom::FindToken;
+use nom::IResult;
 
 #[derive(Debug, Eq, PartialEq)]
 pub enum Key {
@@ -134,4 +137,4 @@ pub(crate) fn parse_string<'a>(start: char, end: char) -> impl Fn(&'a str) -> IR
 
         parser::delimited(parser::char(start), parse_raw_string, parser::char(end))(input)
     }
-}
+}

src/parse/literal.rs

@@ -1,11 +1,9 @@
-use alloc::borrow::ToOwned;
-use crate::parse::key::parse_string;
 use crate::parse::key::Key;
 use crate::parse::parser;
+use alloc::borrow::ToOwned;
 use alloc::format;
 use alloc::string::String;
 use alloc::vec::Vec;
-use nom::Err::Error;
 use nom::IResult;
 
 #[derive(Debug, PartialEq)]

src/parse/mod.rs

@@ -19,9 +19,9 @@ use alloc::{
     borrow::ToOwned,
     collections::BTreeMap,
     rc::Rc,
+    string::String,
     vec,
-    vec::Vec,
-    string::String
+    vec::Vec
 };
 use core::ops::Deref;
 
@@ -35,14 +35,12 @@ pub(super) mod parser {
 }
 
 pub(crate) mod objects {
-    pub(crate) use crate::parse::value::Value;
-    pub(crate) use crate::parse::literal::Literal;
-    pub(crate) use crate::parse::expression::Expression;
-    pub(crate) use crate::parse::call::Call;
     pub(crate) use crate::parse::access::Access;
+    pub(crate) use crate::parse::call::Call;
+    pub(crate) use crate::parse::expression::Expression;
     pub(crate) use crate::parse::key::Key;
-    pub(crate) use crate::parse::list::List;
-    pub(crate) use crate::parse::associative_array::AssociativeArray;
+    pub(crate) use crate::parse::literal::Literal;
+    pub(crate) use crate::parse::value::Value;
 }