merge dev and master, fix conflictsv0.2.5

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"]
 license = "MIT"
 
 [dependencies]
-rustyline   = "4.0.0"
+rustyline   = "4.1.0"
 clap        = "2.32.0"
-radix_fmt   = "0.1.1"
+radix_fmt   = "1.0.0"
 lazy_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() {
             let readline = rl.readline("> ");
             match readline {
                 Ok(line) => {
-                    rl.add_history_entry(line.as_ref());
+                    rl.add_history_entry(line.as_str());
                     let evaled = eval_math_expression(&line[..]);
                     match evaled {
                         Ok(ans) => pprint(ans),