suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use PathBuf::to_string_lossy() instead of to_str() (#1655)

pull/1668/head
Kirawi 2022-02-14 20:22:55 -05:00 committed by GitHub
parent 3a83a764e3
commit 23907a063c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
helix-term/src/commands.rs
View File

@ -1792,9 +1792,8 @@ fn global_search(cx: &mut Context) {
all_matches, all_matches,
move |(_line_num, path)| { move |(_line_num, path)| {
let relative_path = helix_core::path::get_relative_path(path) let relative_path = helix_core::path::get_relative_path(path)
.to_str() .to_string_lossy()
.unwrap() .into_owned();
.to_owned();
if current_path.as_ref().map(|p| p == path).unwrap_or(false) { if current_path.as_ref().map(|p| p == path).unwrap_or(false) {
format!("{} (*)", relative_path).into() format!("{} (*)", relative_path).into()
} else { } else {
@ -3536,9 +3535,8 @@ fn workspace_symbol_picker(cx: &mut Context) {
(&symbol.name).into() (&symbol.name).into()
} else { } else {
let relative_path = helix_core::path::get_relative_path(path.as_path()) let relative_path = helix_core::path::get_relative_path(path.as_path())
.to_str() .to_string_lossy()
.unwrap() .into_owned();
.to_owned();
format!("{} ({})", &symbol.name, relative_path).into() format!("{} ({})", &symbol.name, relative_path).into()
} }
}, },
@ -4209,8 +4207,8 @@ fn goto_impl(
.map(|path| path.to_path_buf()) .map(|path| path.to_path_buf())
.unwrap_or(path) .unwrap_or(path)
}) })
.map(|path| Cow::from(path.to_string_lossy().into_owned()))
.ok() .ok()
.and_then(|path| path.to_str().map(|path| path.to_owned().into()))
}) })
.flatten() .flatten()
.unwrap_or_else(|| location.uri.as_str().into()); .unwrap_or_else(|| location.uri.as_str().into());

10
helix-term/src/ui/mod.rs
View File

@ -155,11 +155,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
files, files,
move |path: &PathBuf| { move |path: &PathBuf| {
// format_fn // format_fn
path.strip_prefix(&root) path.strip_prefix(&root).unwrap_or(path).to_string_lossy()
.unwrap_or(path)
.to_str()
.unwrap()
.into()
}, },
move |cx, path: &PathBuf, action| { move |cx, path: &PathBuf, action| {
cx.editor cx.editor
@ -288,7 +284,7 @@ pub mod completers {
} else { } else {
let file_name = path let file_name = path
.file_name() .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() { let path = match path.parent() {
Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(), Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
@ -331,7 +327,7 @@ pub mod completers {
path.push(""); path.push("");
} }
let path = path.to_str().unwrap().to_owned(); let path = path.to_str()?.to_owned();
Some((end.clone(), Cow::from(path))) Some((end.clone(), Cow::from(path)))
}) })
}) // TODO: unwrap or skip }) // TODO: unwrap or skip