cleaner cd code

1 files changed, 7 insertions, 11 deletions

diff --git a/src/main.rs b/src/main.rs
index df292b5..b1fb7b7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -36,17 +36,13 @@ fn main() -> io::Result<()> {
 			"exit" => return Ok(()),
 			"cd" => {
 				// change directory
-				match parts.next() {
-					None => {
-						let home = env::var("HOME").unwrap();
-						let cd = Path::new(home.as_str());
-						env::set_current_dir(&cd)?;							
-					},
-					Some(p) => {
-						let cd = Path::new(&p);
-						env::set_current_dir(&cd)?;
-					}
-				};
+				let new_dir = parts.peekable().peek()
+					.map_or(env::var("HOME").unwrap(),
+							|x| (*x).clone());
+				let new_wd = Path::new(&new_dir);
+				if let Err(e) = env::set_current_dir(&new_wd) {
+					eprintln!("{}", e);
+				}
 			},
 			command => {
 				let child = Command::new(command)