Merge branch 'master' into pickfire-help

6 files changed, 2 insertions, 3 deletions

diff --git a/src/error/mod.rs b/src/error.rs
index e05d4e3..e05d4e3 100644
--- a/src/error/mod.rs
+++ b/src/error.rs
diff --git a/src/format/mod.rs b/src/format.rs
index 45673d7..45673d7 100644
--- a/src/format/mod.rs
+++ b/src/format.rs
diff --git a/src/lex/mod.rs b/src/lex.rs
index b3faff8..76f61a0 100644
--- a/src/lex/mod.rs
+++ b/src/lex.rs
@@ -5,9 +5,8 @@
 use lazy_static::lazy_static;
 use std::collections::HashMap;
 
-use crate::CONFIGURATION;
-
 use crate::error::{CalcError, Math};
+use crate::CONFIGURATION;
 
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub struct Operator {
diff --git a/src/main.rs b/src/main.rs
index 7086d15..94f4cbc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -192,7 +192,7 @@ fn parse_arguments() -> Configuration {
 }
 
 pub fn eval_math_expression(input: &str, prev_ans: Option<f64>) -> Result<f64, CalcError> {
-    let input = input.trim();
+    let input = input.trim().replace(" ", "");
     if input == "help" {
         return Err(CalcError::Help);
     }
diff --git a/src/parse/mod.rs b/src/parse.rs
index aa8bd4b..aa8bd4b 100644
--- a/src/parse/mod.rs
+++ b/src/parse.rs
diff --git a/src/readline/mod.rs b/src/readline.rs
index d689f95..d689f95 100644
--- a/src/readline/mod.rs
+++ b/src/readline.rs