aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsilwol <wolfgang@silbermayr.at>2023-09-28 11:26:54 +0200
committerGitHub <noreply@github.com>2023-09-28 11:26:54 +0200
commite789d6bf453fac9810ec3bc01455d2e197e0cef2 (patch)
tree2cfef72b76eefa546f19dba0803b02611b05eb77
parentchore(files): remove leftover Cargo.lock file from session-manager plugin (#2... (diff)
downloadsl0ppij-e789d6bf453fac9810ec3bc01455d2e197e0cef2.tar.gz
sl0ppij-e789d6bf453fac9810ec3bc01455d2e197e0cef2.tar.xz
sl0ppij-e789d6bf453fac9810ec3bc01455d2e197e0cef2.zip
chore: migrate to directories from directories-next (#2820)
The `directories-next` crate used to be the go-to fork crate when `directories` was unmaintained for some time. This has changed, nowadays `directories-next` appears abandoned while `directories` has a more recent release.
-rw-r--r--Cargo.lock30
-rw-r--r--zellij-utils/Cargo.toml2
-rw-r--r--zellij-utils/src/consts.rs2
-rw-r--r--zellij-utils/src/setup.rs2
4 files changed, 21 insertions, 15 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 6803fc71..e6997659 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -836,13 +836,12 @@ dependencies = [
]
[[package]]
-name = "directories-next"
-version = "2.0.0"
+name = "directories"
+version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
+ "dirs-sys 0.4.1",
]
[[package]]
@@ -852,7 +851,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
dependencies = [
"cfg-if 0.1.10",
- "dirs-sys",
+ "dirs-sys 0.3.7",
]
[[package]]
@@ -861,7 +860,7 @@ version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
dependencies = [
- "dirs-sys",
+ "dirs-sys 0.3.7",
]
[[package]]
@@ -876,14 +875,15 @@ dependencies = [
]
[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
+name = "dirs-sys"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [
"libc",
+ "option-ext",
"redox_users",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2010,6 +2010,12 @@ dependencies = [
]
[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
name = "ordered-float"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4633,7 +4639,7 @@ dependencies = [
"colored",
"colorsys",
"crossbeam",
- "directories-next",
+ "directories",
"include_dir",
"insta",
"interprocess",
diff --git a/zellij-utils/Cargo.toml b/zellij-utils/Cargo.toml
index b728a97a..6c66e9a2 100644
--- a/zellij-utils/Cargo.toml
+++ b/zellij-utils/Cargo.toml
@@ -18,7 +18,7 @@ clap_complete = "3.2.1"
colored = "2.0.0"
colorsys = "0.6.5"
crossbeam = "0.8.1"
-directories-next = "2.0"
+directories = "5.0"
lazy_static = "1.4.0"
libc = "0.2"
nix = "0.23.1"
diff --git a/zellij-utils/src/consts.rs b/zellij-utils/src/consts.rs
index 9091052b..d7593494 100644
--- a/zellij-utils/src/consts.rs
+++ b/zellij-utils/src/consts.rs
@@ -1,6 +1,6 @@
//! Zellij program-wide constants.
-use directories_next::ProjectDirs;
+use directories::ProjectDirs;
use include_dir::{include_dir, Dir};
use lazy_static::lazy_static;
use once_cell::sync::OnceCell;
diff --git a/zellij-utils/src/setup.rs b/zellij-utils/src/setup.rs
index 09009a85..bacb12b4 100644
--- a/zellij-utils/src/setup.rs
+++ b/zellij-utils/src/setup.rs
@@ -16,7 +16,7 @@ use crate::{
};
use clap::{Args, IntoApp};
use clap_complete::Shell;
-use directories_next::BaseDirs;
+use directories::BaseDirs;
use serde::{Deserialize, Serialize};
use std::{
convert::TryFrom, fmt::Write as FmtWrite, io::Write, path::Path, path::PathBuf, process,