git.iko.soy/helix
on master help sign in
use PathBuf::to_string_lossy() instead of to_str() (#1655)
commit23907a063c43f06f120d80a6ec0b6748881236a1 authorKirawi <67773714+kirawi@users.noreply.github.com> dateMon 14 Feb 2022, 20:22 (5 years ago) parent3a83a76
2 files changed+8−14
compare with master
unifiedsplit
helix-term/src/commands.rs+5−7 helix-term/src/ui/mod.rs+3−7
helix-term/src/commands.rs+5−7
@@ -1792,9 +1792,8 @@ fn global_search(cx: &mut Context) {
17921792 all_matches,
17931793 move |(_line_num, path)| {
17941794 let relative_path = helix_core::path::get_relative_path(path)
1795− .to_str()
1796− .unwrap()
1797− .to_owned();
1795+ .to_string_lossy()
1796+ .into_owned();
17981797 if current_path.as_ref().map(|p| p == path).unwrap_or(false) {
17991798 format!("{} (*)", relative_path).into()
18001799 } else {
@@ -3536,9 +3535,8 @@ fn workspace_symbol_picker(cx: &mut Context) {
35363535 (&symbol.name).into()
35373536 } else {
35383537 let relative_path = helix_core::path::get_relative_path(path.as_path())
3539− .to_str()
3540− .unwrap()
3541− .to_owned();
3538+ .to_string_lossy()
3539+ .into_owned();
35423540 format!("{} ({})", &symbol.name, relative_path).into()
35433541 }
35443542 },
@@ -4209,8 +4207,8 @@ fn goto_impl(
42094207 .map(|path| path.to_path_buf())
42104208 .unwrap_or(path)
42114209 })
4210+ .map(|path| Cow::from(path.to_string_lossy().into_owned()))
42124211 .ok()
4213− .and_then(|path| path.to_str().map(|path| path.to_owned().into()))
42144212 })
42154213 .flatten()
42164214 .unwrap_or_else(|| location.uri.as_str().into());
helix-term/src/ui/mod.rs+3−7
@@ -155,11 +155,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
155155 files,
156156 move |path: &PathBuf| {
157157 // format_fn
158− path.strip_prefix(&root)
159− .unwrap_or(path)
160− .to_str()
161− .unwrap()
162− .into()
158+ path.strip_prefix(&root).unwrap_or(path).to_string_lossy()
163159 },
164160 move |cx, path: &PathBuf, action| {
165161 cx.editor
@@ -288,7 +284,7 @@ pub mod completers {
288284 } else {
289285 let file_name = path
290286 .file_name()
291− .map(|file| file.to_str().unwrap().to_owned());
287+ .and_then(|file| file.to_str().map(|path| path.to_owned()));
292288
293289 let path = match path.parent() {
294290 Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
@@ -331,7 +327,7 @@ pub mod completers {
331327 path.push("");
332328 }
333329
334− let path = path.to_str().unwrap().to_owned();
330+ let path = path.to_str()?.to_owned();
335331 Some((end.clone(), Cow::from(path)))
336332 })
337333 }) // TODO: unwrap or skip