From 23907a063c43f06f120d80a6ec0b6748881236a1 Mon Sep 17 00:00:00 2001
From: Kirawi
Date: Mon, 14 Feb 2022 20:22:55 -0500
Subject: use PathBuf::to_string_lossy() instead of to_str() (#1655)

---
 helix-term/src/ui/mod.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'helix-term/src/ui')

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 49f7b2fa..edff0583 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -155,11 +155,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
         files,
         move |path: &PathBuf| {
             // format_fn
-            path.strip_prefix(&root)
-                .unwrap_or(path)
-                .to_str()
-                .unwrap()
-                .into()
+            path.strip_prefix(&root).unwrap_or(path).to_string_lossy()
         },
         move |cx, path: &PathBuf, action| {
             cx.editor
@@ -288,7 +284,7 @@ pub mod completers {
         } else {
             let file_name = path
                 .file_name()
-                .map(|file| file.to_str().unwrap().to_owned());
+                .and_then(|file| file.to_str().map(|path| path.to_owned()));
 
             let path = match path.parent() {
                 Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
@@ -331,7 +327,7 @@ pub mod completers {
                         path.push("");
                     }
 
-                    let path = path.to_str().unwrap().to_owned();
+                    let path = path.to_str()?.to_owned();
                     Some((end.clone(), Cow::from(path)))
                 })
             }) // TODO: unwrap or skip
-- 
cgit v1.2.3-70-g09d2