Remove some unnecessary unwraps by using the Result::ok

combinatoric
2018-12-29 22:33:28 +00:00
parent c881fc607e
commit 07202f944c
1 changed files with 2 additions and 6 deletions
--- a/crates/ra_vfs/src/lib.rs
+++ b/crates/ra_vfs/src/lib.rs
@@ -59,12 +59,8 @@ impl RootFilter {
        if !(self.file_filter)(path) {
            return None;
        }
-        if !(path.starts_with(&self.root)) {
-            return None;
-        }
-        let path = path.strip_prefix(&self.root).unwrap();
-        let path = RelativePathBuf::from_path(path).unwrap();
-        Some(path)
+        let path = path.strip_prefix(&self.root).ok()?;
+        RelativePathBuf::from_path(path).ok()
    }
 }