rework imports

vic1707 · Oct 31, 2023 · 1c8c8df · 1c8c8df
1 parent bfc29dd
commit 1c8c8df
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/src/element/binop.rs b/src/element/binop.rs
@@ -1,8 +1,7 @@
 /* Built-in imports */
 use core::fmt;
 /* Crate imports */
-use super::Element;
-use crate::token::Operator;
+use crate::{element::Element, token::Operator};
 
 #[derive(Debug, PartialOrd)]
 pub struct BinOp<'a> {

diff --git a/src/element/function_call.rs b/src/element/function_call.rs
@@ -1,8 +1,7 @@
 /* Built-in imports */
 use core::fmt;
 /* Crate imports */
-use super::Element;
-use crate::token::Function;
+use crate::{element::Element, token::Function};
 
 #[derive(Debug, PartialEq, PartialOrd)]
 pub struct FunctionCall<'a> {

diff --git a/src/element/simplify.rs b/src/element/simplify.rs
@@ -1,6 +1,8 @@
 /* Crate imports */
-use super::{BinOp, Element, FunctionCall, UnOp};
-use crate::token::Operator;
+use crate::{
+    element::{BinOp, Element, FunctionCall, UnOp},
+    token::Operator,
+};
 
 pub trait Simplify<'a> {
     fn simplify_for(self, var: (&str, f64)) -> Element<'a>;

diff --git a/src/element/unop.rs b/src/element/unop.rs
@@ -1,8 +1,7 @@
 /* Built-in imports */
 use core::fmt;
 /* Crate imports */
-use super::Element;
-use crate::token::Operator;
+use crate::{element::Element, token::Operator};
 
 #[derive(Debug, PartialEq, PartialOrd)]
 pub struct UnOp<'a> {

diff --git a/src/token/identifier.rs b/src/token/identifier.rs
@@ -1,8 +1,7 @@
 /* Built-in imports */
 use core::f64;
 /* Crate imports */
-use super::Function;
-use crate::utils::built_in_functions;
+use crate::{token::Function, utils::built_in_functions};
 
 #[derive(Debug, PartialEq, PartialOrd)]
 pub enum Identifier<'a> {