Remove unnecessary `unwrap` (#2599)

`strip_prefix` will itself check whether the string starts with the
prefix, so the extra call to `starts_with` was unnecessary.
pull/2601/head
Hugo 3 years ago committed by GitHub
parent 10415a8069
commit 89c6e8aa94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -5,9 +5,8 @@ use std::path::{Component, Path, PathBuf};
/// is available, otherwise returns the path unchanged. /// is available, otherwise returns the path unchanged.
pub fn fold_home_dir(path: &Path) -> PathBuf { pub fn fold_home_dir(path: &Path) -> PathBuf {
if let Ok(home) = home_dir() { if let Ok(home) = home_dir() {
if path.starts_with(&home) { if let Ok(stripped) = path.strip_prefix(&home) {
// it's ok to unwrap, the path starts with home dir return PathBuf::from("~").join(stripped);
return PathBuf::from("~").join(path.strip_prefix(&home).unwrap());
} }
} }

Loading…
Cancel
Save