Trimming zeroes at the start of scientific notation, and scientific n…

…otation exponent value fix
PaddiM8 · Dec 13, 2020 · bd86091 · bd86091
1 parent 318e8b8
commit bd86091
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kalk/Cargo.toml b/kalk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kalk"
-version = "1.2.3"
+version = "1.2.4"
 authors = ["PaddiM8"]
 edition = "2018"
 readme = "README.md"

diff --git a/kalk/src/kalk_num.rs b/kalk/src/kalk_num.rs
@@ -25,7 +25,7 @@ impl ScientificNotation {
             digits_and_mul.insert(1usize, '.');
         }
 
-        format!("{}{}10^{}", sign, digits_and_mul, self.exponent.to_string())
+        format!("{}{}10^{}", sign, digits_and_mul, self.exponent - 1)
     }
 }
 
@@ -74,6 +74,7 @@ impl KalkNum {
         ScientificNotation {
             negative: neg,
             digits: digits
+                .trim_start_matches('0')
                 .trim_end_matches('0')
                 .trim_end_matches('.')
                 .to_string(),

diff --git a/kalk_cli/Cargo.toml b/kalk_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kalk_cli"
-version = "0.3.5"
+version = "0.3.6"
 authors = ["PaddiM8"]
 edition = "2018"
 readme = "../README.md"
@@ -16,7 +16,7 @@ path = "src/main.rs"
 name = "kalk"
 
 [dependencies]
-kalk = { path = "../kalk", version = "^1.2.3" }
+kalk = { path = "../kalk", version = "^1.2.4" }
 rustyline = "7.0.0"
 ansi_term = "0.12"
 regex = "1"