From 1f657c8e911b6fa3e6f1fbcb470fd7ee711edcf6 Mon Sep 17 00:00:00 2001
From: Benjamin Elliott <benjam.elliott@gmail.com>
Date: Tue, 20 Oct 2015 17:06:30 -0600
Subject: [PATCH] Avoid using _unused
Use the result information to catch bad commands before running them
---
src/lib.rs | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/lib.rs b/src/lib.rs
index c59145e5..870676ad 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,16 +6,20 @@ use command::*;
pub fn repl() {
let mut input = String::new();
- let _unused = io::stdin().read_line(&mut input);
- let out_wrap = run(input.trim().split_whitespace().collect::<Vec<&str>>());
- if out_wrap.is_some() {
- let out = out_wrap.unwrap();
- if out.stdout.is_empty() {
- println!("{}",out.stderr.trim());
- } else {
- println!("{}",out.stdout.trim());
+ match io::stdin().read_line(&mut input) {
+ Ok(n) => {
+ let out_wrap = run(input.trim().split_whitespace().collect::<Vec<&str>>());
+ if out_wrap.is_some() {
+ let out = out_wrap.unwrap();
+ if out.stdout.is_empty() {
+ println!("{}",out.stderr.trim());
+ } else {
+ println!("{}",out.stdout.trim());
+ }
+ } else {
+ println!("{} is not a valid command", input.trim());
+ }
}
- } else {
- println!("{} is not a valid command", input.trim());
- }
+ Err(error) => println!("Line Read Error: {}", error)
+ };
}
--
GitLab