From 90cf1fff49dbbf12bf4151878674ad3ff567dcaf Mon Sep 17 00:00:00 2001
From: El-BG-1970 <elouan.gros.fr@gmail.com>
Date: Wed, 27 Apr 2022 14:51:07 +0200
Subject: cleaner cd code

---
 src/main.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/main.rs')

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)
-- 
cgit v1.2.3