From 3e69a4852eb9914ced7438c0788170c43756d741 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Thu, 28 Oct 2021 10:50:17 +0900
Subject: Simplify set_path

---
 helix-view/src/document.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'helix-view')

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 4d779656..27a19f3c 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -554,11 +554,9 @@ impl Document {
     }
 
     pub fn set_path(&mut self, path: Option<&Path>) -> Result<(), std::io::Error> {
-        let path = if let Some(p) = path {
-            Some(helix_core::path::get_canonicalized_path(p)?)
-        } else {
-            path.map(|p| p.into())
-        };
+        let path = path
+            .map(|path| helix_core::path::get_canonicalized_path(path))
+            .transpose()?;
 
         // if parent doesn't exist we still want to open the document
         // and error out when document is saved
-- 
cgit v1.2.3-70-g09d2