diff options
| author | NerdyPepper <[email protected]> | 2019-06-20 18:07:54 +0100 |
|---|---|---|
| committer | NerdyPepper <[email protected]> | 2019-06-20 18:07:54 +0100 |
| commit | d9d03c08b45b58850df398477618811a29345df7 (patch) | |
| tree | c101fcd7a559108e3eaabaa3d525cefd9ca1a799 /src | |
| parent | 784da4e3e3a106a08d9bc91926ae5a2f3a3286d4 (diff) | |
| parent | 4811ea296c380a89794334b79e74c6b6e3aa6569 (diff) | |
merge dev and master, fix conflictsv0.2.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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), |