From 625bbcc0b9e6c2c45a7ed2baba951a82b4e80d23 Mon Sep 17 00:00:00 2001 From: Damjan Georgievski Date: Sun, 22 Jul 2018 07:41:05 +0200 Subject: [PATCH] replace the unwrap with a error return don't panic on std::fs::read_dir error (although permission errors are returned as 404 responses) --- src/web.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/web.rs b/src/web.rs index 5929cf5..e58acde 100644 --- a/src/web.rs +++ b/src/web.rs @@ -28,9 +28,9 @@ fn handle_directory<'a, 'b>( req: &'b HttpRequest, ) -> std::io::Result { - let mut paths: Vec<_> = std::fs::read_dir(&dir.path).unwrap() - .filter_map(|entry| if dir.is_visible(&entry) { entry.ok() } else {None}) - .collect(); + let rd = std::fs::read_dir(&dir.path)?; + + let mut paths : Vec<_> = rd.filter_map(|entry| if dir.is_visible(&entry) { entry.ok() } else {None}).collect(); paths.sort_by_key(|r| (!r.metadata().unwrap().file_type().is_dir(), r.file_name()));