ceos/tealdeer
1
0
Fork 0
mirror of https://github.com/tealdeer-rs/tealdeer.git synced 2026-08-21 23:54:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename expand_path to expand_home

Browse source
This commit is contained in:
Ellis Clayton 2026-04-30 19:08:28 +10:00
commit 04d41fdbf2
No known key found for this signature in database
GPG key ID: A2A2BF86BEB49FC6
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/config.rs
View file

@ -592,7 +592,7 @@ impl<'a> Config<'a> {
}
} else if let Some(config_value) = &raw_config.directories.cache_dir {
// Resolve possible ~ prefixed path
let expanded_path = expand_path(config_value, home_path.as_ref())?;
let expanded_path = expand_home(config_value, home_path.as_ref())?;
// Resolve possible relative path.
let resolved_path = relative_path_root.join(expanded_path);
@ -616,7 +616,7 @@ impl<'a> Config<'a> {
.as_ref()
.map(|path| -> Result<PathWithSource> {
// Resolve possible ~ prefixed path
let expanded_path = expand_path(path, home_path.as_ref())?;
let expanded_path = expand_home(path, home_path.as_ref())?;
// Resolve possible relative path.
let resolved_path = relative_path_root.join(expanded_path);
@ -654,7 +654,7 @@ impl<'a> Config<'a> {
}
/// Expands tilde (~) prefixed directories into its absolute version
fn expand_path<'a>(input_path: &'a PathBuf, home_path: Option<&PathBuf>) -> Result<Cow<'a, Path>> {
fn expand_home<'a>(input_path: &'a PathBuf, home_path: Option<&PathBuf>) -> Result<Cow<'a, Path>> {
if input_path.is_absolute() {
return Ok(Cow::Borrowed(input_path));
}
@ -834,7 +834,7 @@ mod test {
let path_to_expand = PathBuf::from("~/baz");
assert_eq!(
*expand_path(&path_to_expand, home.as_ref()).unwrap(),
*expand_home(&path_to_expand, home.as_ref()).unwrap(),
PathBuf::from("/foo/bar/baz")
);
}
@ -845,7 +845,7 @@ mod test {
let dir_to_expand = PathBuf::from("/one/two");
assert_eq!(
*expand_path(&dir_to_expand, home.as_ref()).unwrap(),
*expand_home(&dir_to_expand, home.as_ref()).unwrap(),
dir_to_expand
);
}
@ -855,7 +855,7 @@ mod test {
let home = Some(PathBuf::from("/foo/bar"));
let dir_to_expand = PathBuf::from("~baz/foo");
assert!(expand_path(&dir_to_expand, home.as_ref()).is_err());
assert!(expand_home(&dir_to_expand, home.as_ref()).is_err());
}
#[test]