GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use dirs-next instead of dirs

Browse source
This commit is contained in:
Dustin J. Mitchell 2021-04-16 09:21:59 -04:00
parent 10536f024d
commit 6c0f7a736f
3 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/Cargo.toml
View file

@ -5,7 +5,7 @@ name = "taskchampion-cli"
version = "0.3.0"
[dependencies]
dirs = "^3.0.1"
dirs-next = "^2.0.0"
env_logger = "^0.8.3"
anyhow = "1.0"
log = "^0.4.14"

4
cli/src/settings.rs
View file

@ -37,7 +37,7 @@ pub(crate) fn default_settings() -> anyhow::Result<Config> {
let mut settings = Config::default();
// set up defaults
if let Some(dir) = dirs::data_local_dir() {
if let Some(dir) = dirs_next::data_local_dir() {
let mut tc_dir = dir.clone();
tc_dir.push("taskchampion");
settings.set_default(
@ -71,7 +71,7 @@ pub(crate) fn read_settings() -> anyhow::Result<Config> {
let config_file: File<FileSourceFile> = config_file.into();
settings.merge(config_file.required(true))?;
env::remove_var("TASKCHAMPION_CONFIG");
} else if let Some(mut dir) = dirs::config_dir() {
} else if let Some(mut dir) = dirs_next::config_dir() {
dir.push("taskchampion");
log::debug!("Loading configuration from {:?} (optional)", dir);
let config_file: File<FileSourceFile> = dir.into();