From 89c6e8aa9419df3b7975bcae28f83e2ccc3bc318 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 29 May 2022 04:13:21 +0200 Subject: 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.--- helix-core/src/path.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'helix-core') diff --git a/helix-core/src/path.rs b/helix-core/src/path.rs index 6bf722a7..cb50e136 100644 --- a/helix-core/src/path.rs +++ b/helix-core/src/path.rs @@ -5,9 +5,8 @@ use std::path::{Component, Path, PathBuf}; /// is available, otherwise returns the path unchanged. pub fn fold_home_dir(path: &Path) -> PathBuf { if let Ok(home) = home_dir() { - if path.starts_with(&home) { - // it's ok to unwrap, the path starts with home dir - return PathBuf::from("~").join(path.strip_prefix(&home).unwrap()); + if let Ok(stripped) = path.strip_prefix(&home) { + return PathBuf::from("~").join(stripped); } } -- cgit v1.2.3-70-g09d2