aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNerdyPepper <[email protected]>2019-06-20 18:07:54 +0100
committerNerdyPepper <[email protected]>2019-06-20 18:07:54 +0100
commitd9d03c08b45b58850df398477618811a29345df7 (patch)
treec101fcd7a559108e3eaabaa3d525cefd9ca1a799
parent784da4e3e3a106a08d9bc91926ae5a2f3a3286d4 (diff)
parent4811ea296c380a89794334b79e74c6b6e3aa6569 (diff)
merge dev and master, fix conflictsv0.2.5
-rw-r--r--Cargo.toml4
-rw-r--r--src/main.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 8c10596..5b9c33f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["command-line-interface", "science", "parser-implementations"]
12license = "MIT" 12license = "MIT"
13 13
14[dependencies] 14[dependencies]
15rustyline = "4.0.0" 15rustyline = "4.1.0"
16clap = "2.32.0" 16clap = "2.32.0"
17radix_fmt = "0.1.1" 17radix_fmt = "1.0.0"
18lazy_static = "1.3.0" 18lazy_static = "1.3.0"
diff --git a/src/main.rs b/src/main.rs
index a8fbcf2..d6883d5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -139,7 +139,7 @@ fn main() {
139 let readline = rl.readline("> "); 139 let readline = rl.readline("> ");
140 match readline { 140 match readline {
141 Ok(line) => { 141 Ok(line) => {
142 rl.add_history_entry(line.as_ref()); 142 rl.add_history_entry(line.as_str());
143 let evaled = eval_math_expression(&line[..]); 143 let evaled = eval_math_expression(&line[..]);
144 match evaled { 144 match evaled {
145 Ok(ans) => pprint(ans), 145 Ok(ans) => pprint(ans),