From a8446c53bb32fa7c2d1fc4cddb4720b737b2cc8a Mon Sep 17 00:00:00 2001 From: nickelc Date: Sun, 5 Mar 2023 21:07:25 +0100 Subject: Update dependencies & switch back to the `dirs` crate (#1325) * Update direct dependencies * Update transient dependencies * Switch back to `dirs` crate The `dirs`/`dirs-sys` repositories are unarchived and the crates are maintained again, while `dirs-next` crates aren't. --- src/features/navigate.rs | 4 ++-- src/utils/bat/dirs.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/features/navigate.rs b/src/features/navigate.rs index f78a675..d04f808 100644 --- a/src/features/navigate.rs +++ b/src/features/navigate.rs @@ -90,7 +90,7 @@ pub fn copy_less_hist_file_and_append_navigate_regex(config: &Config) -> std::io #[cfg(target_os = "windows")] fn get_delta_less_hist_file() -> std::io::Result { - let mut path = dirs_next::data_local_dir() + let mut path = dirs::data_local_dir() .ok_or_else(|| Error::new(ErrorKind::NotFound, "Can't find AppData\\Local folder"))?; path.push("delta"); std::fs::create_dir_all(&path)?; @@ -113,7 +113,7 @@ fn get_delta_less_hist_file() -> std::io::Result { // "$HOME/lesshst.ini" or "$INIT/lesshst.ini" on OS/2 // systems. fn get_less_hist_file() -> Option { - if let Some(home_dir) = dirs_next::home_dir() { + if let Some(home_dir) = dirs::home_dir() { match std::env::var("LESSHISTFILE").as_deref() { Ok("-") | Ok("/dev/null") => { // The user has explicitly disabled less history. diff --git a/src/utils/bat/dirs.rs b/src/utils/bat/dirs.rs index efaef81..00fc0dd 100644 --- a/src/utils/bat/dirs.rs +++ b/src/utils/bat/dirs.rs @@ -20,10 +20,10 @@ impl BatProjectDirs { let cache_dir_op = env::var_os("XDG_CACHE_HOME") .map(PathBuf::from) .filter(|p| p.is_absolute()) - .or_else(|| dirs_next::home_dir().map(|d| d.join(".cache"))); + .or_else(|| dirs::home_dir().map(|d| d.join(".cache"))); #[cfg(not(target_os = "macos"))] - let cache_dir_op = dirs_next::cache_dir(); + let cache_dir_op = dirs::cache_dir(); let cache_dir = cache_dir_op.map(|d| d.join("bat"))?; -- cgit v1.2.3