From 07202f944c556ef71f6d6676189db73ed5980992 Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sat, 29 Dec 2018 22:33:28 +0000
Subject: Remove some unnecessary unwraps by using the `Result::ok`
 combinatoric

---
 crates/ra_vfs/src/lib.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'crates/ra_vfs/src/lib.rs')

diff --git a/crates/ra_vfs/src/lib.rs b/crates/ra_vfs/src/lib.rs
index ced86740b..90d5e21f4 100644
--- 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()
     }
 }
 
-- 
cgit v1.2.3