src/control.rs

@@ -1,6 +1,6 @@
 use crate::command::Command;
 use crate::exit_code::ExitCode;
-use crate::interface::get_user_input;
+use crate::interface::{get_user_input, print_prompt};
 use crate::parser::parse;
 
 fn exit(code: &ExitCode) {
@@ -13,6 +13,7 @@ pub fn run() {
     let mut current_exit_code = ExitCode::new(0);
 
     loop {
+        print_prompt();
         let user_input = get_user_input();
 
         if user_input.is_some() {

src/interface.rs

@@ -1,22 +1,21 @@
 use std::io::Write;
 use std::io::{stdin, stdout};
 
-fn print_prompt() {
+pub fn print_prompt() {
     print!("$ ");
     stdout().flush().unwrap();
 }
 
 pub fn get_user_input() -> Option<String> {
-    print_prompt();
-
     let mut user_input = String::new();
 
     let bytes_read = stdin()
         .read_line(&mut user_input)
         .expect("error reading user input");
 
-    match bytes_read {
+    if bytes_read == 0 {
-        0 => None,
+        None
-        _ => Some(user_input),
+    } else {
+        Some(user_input)
     }
 }

src/parser.rs

@@ -17,10 +17,11 @@ fn parse_quote(characters: &mut Vec<char>) -> String {
 }
 
 fn parse_backslash(characters: &mut Vec<char>) -> Option<char> {
-    let escaped_char = match characters.is_empty() {
+    let mut escaped_char: Option<char> = None;
-        false => Some(characters.pop().unwrap()),
+
-        true => None,
+    if !characters.is_empty() {
-    };
+        escaped_char = Some(characters.pop().unwrap());
+    }
 
     escaped_char
 }