diff --git a/src/help.rs b/src/help.rs index 4d8ef4d..2cf6ff5 100644 --- a/src/help.rs +++ b/src/help.rs @@ -4,37 +4,26 @@ pub fn help_text() -> String { format!( " {} - {} - {}: reqsh - {}: {} Show help {} Show version - {} - {}: {} [Headers] - [Body] ::send - {}: GET, POST, PUT, DELETE - {}: : param: = - {}: raw, json - {} - {}: base header @@ -50,7 +39,6 @@ pub fn help_text() -> String { rerun help exit - {} ", "reqsh help".bold().cyan(), diff --git a/src/main.rs b/src/main.rs index cb08926..4423343 100644 --- a/src/main.rs +++ b/src/main.rs @@ -59,7 +59,7 @@ fn shell_loop() { break; } Err(e) => { - println!("{}", e.red().bold()); + eprintln!("{}", e.red().bold()); } }, @@ -70,7 +70,7 @@ fn shell_loop() { println!("{}", res); } Err(e) => { - println!("{}", e.red().bold()); + eprintln!("{}", e.red().bold()); } } } @@ -82,7 +82,7 @@ fn shell_loop() { }, Err(e) => { - println!("{}", e.red().bold()); + eprintln!("{}", e.red().bold()); } } } @@ -96,7 +96,7 @@ fn shell_loop() { } Err(err) => { - println!("Error: {:?}", err); + eprintln!("Error: {:?}", err); break; } } @@ -132,7 +132,7 @@ fn collect_input(rl: &mut Editor, first_line: String) } Err(err) => { - println!("Error: {:?}", err); + eprintln!("Error: {:?}", err); buffer.clear(); continue; } diff --git a/src/parser.rs b/src/parser.rs index 8ac98fc..0db700c 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -13,8 +13,13 @@ pub fn parse(input: String) -> Result { let first_line = input.lines().next().unwrap(); let tokens: Vec<&str> = first_line.split_whitespace().collect(); - match tokens[0] { - "GET" | "POST" | "PUT" | "DELETE" => { + if tokens.is_empty() { + return Err("No command provided".to_string()); + } + + let token_match = tokens[0].to_lowercase(); + match token_match.as_str() { + "get" | "post" | "put" | "delete" => { let result = parse_request(input)?; Ok(Parsed::Request(result)) } @@ -27,7 +32,7 @@ pub fn parse(input: String) -> Result { "exit" => Ok(Parsed::Exit), - _ => Err(format!("Reference Error: {} not defined", { tokens[0] })), + _ => Err(format!("Reference Error: {} not defined", tokens[0])), } }