From 6d08eacd98b873417435a72eff5c4fa26d338561 Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Sat, 28 Nov 2020 19:43:30 -0500 Subject: [PATCH] limit config file usage to just yaml --- Cargo.lock | 107 +++++++++++----------------------------------- cli/Cargo.toml | 2 +- docs/src/usage.md | 2 +- 3 files changed, 27 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a683e918..6b649fe16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -74,7 +74,7 @@ dependencies = [ "pin-project 1.0.2", "rand 0.7.3", "regex", - "serde 1.0.117", + "serde", "serde_json", "serde_urlencoded", "sha-1", @@ -102,7 +102,7 @@ dependencies = [ "http", "log", "regex", - "serde 1.0.117", + "serde", ] [[package]] @@ -241,7 +241,7 @@ dependencies = [ "mime", "pin-project 1.0.2", "regex", - "serde 1.0.117", + "serde", "serde_json", "serde_urlencoded", "socket2", @@ -372,7 +372,7 @@ dependencies = [ "mime", "percent-encoding", "rand 0.7.3", - "serde 1.0.117", + "serde", "serde_json", "serde_urlencoded", ] @@ -479,7 +479,7 @@ dependencies = [ "lazy_static", "memchr", "regex-automata", - "serde 1.0.117", + "serde", ] [[package]] @@ -535,8 +535,8 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ "libc", "num-integer", - "num-traits 0.2.14", - "serde 1.0.117", + "num-traits", + "serde", "time 0.1.44", "winapi 0.3.9", ] @@ -588,11 +588,7 @@ checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" dependencies = [ "lazy_static", "nom", - "rust-ini", - "serde 1.0.117", - "serde-hjson", - "serde_json", - "toml", + "serde", "yaml-rust", ] @@ -629,7 +625,7 @@ dependencies = [ "idna", "log", "publicsuffix", - "serde 1.0.117", + "serde", "serde_json", "time 0.2.23", "url", @@ -677,7 +673,7 @@ dependencies = [ "csv-core", "itoa", "ryu", - "serde 1.0.117", + "serde", ] [[package]] @@ -840,7 +836,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" dependencies = [ - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -1168,7 +1164,7 @@ checksum = "cb79e59d356a5ae85b13990bbb3649a293d64df1ca6e7890822076186527a9f7" dependencies = [ "lmdb-rkv", "rmp-serde", - "serde 1.0.117", + "serde", "thiserror", "toml", ] @@ -1204,16 +1200,6 @@ version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" -[[package]] -name = "linked-hash-map" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" -dependencies = [ - "serde 0.8.23", - "serde_test", -] - [[package]] name = "linked-hash-map" version = "0.5.3" @@ -1267,7 +1253,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" dependencies = [ - "linked-hash-map 0.5.3", + "linked-hash-map", ] [[package]] @@ -1381,16 +1367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg 1.0.1", - "num-traits 0.2.14", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -1606,7 +1583,7 @@ dependencies = [ "bitflags", "byteorder", "lazy_static", - "num-traits 0.2.14", + "num-traits", "quick-error", "rand 0.6.5", "rand_chacha 0.1.1", @@ -1907,7 +1884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f10b46df14cf1ee1ac7baa4d2fbc2c52c0622a4b82fa8740e37bc452ac0184f" dependencies = [ "byteorder", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -1918,7 +1895,7 @@ checksum = "4ce7d70c926fe472aed493b902010bccc17fa9f7284145cb8772fd22fdb052d8" dependencies = [ "byteorder", "rmp", - "serde 1.0.117", + "serde", ] [[package]] @@ -1933,12 +1910,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rust-ini" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" - [[package]] name = "rustc-demangle" version = "0.1.18" @@ -2016,12 +1987,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "serde" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" - [[package]] name = "serde" version = "1.0.117" @@ -2031,19 +1996,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-hjson" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8" -dependencies = [ - "lazy_static", - "linked-hash-map 0.3.0", - "num-traits 0.1.43", - "regex", - "serde 0.8.23", -] - [[package]] name = "serde_derive" version = "1.0.117" @@ -2063,16 +2015,7 @@ checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" dependencies = [ "itoa", "ryu", - "serde 1.0.117", -] - -[[package]] -name = "serde_test" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" -dependencies = [ - "serde 0.8.23", + "serde", ] [[package]] @@ -2084,7 +2027,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.117", + "serde", ] [[package]] @@ -2182,7 +2125,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ "proc-macro2", "quote", - "serde 1.0.117", + "serde", "serde_derive", "syn", ] @@ -2196,7 +2139,7 @@ dependencies = [ "base-x", "proc-macro2", "quote", - "serde 1.0.117", + "serde", "serde_derive", "serde_json", "sha1", @@ -2247,7 +2190,7 @@ dependencies = [ "kv", "lmdb-rkv", "proptest", - "serde 1.0.117", + "serde", "serde_json", "tempdir", "ureq", @@ -2465,7 +2408,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" dependencies = [ - "serde 1.0.117", + "serde", ] [[package]] @@ -2631,7 +2574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" dependencies = [ "rand 0.7.3", - "serde 1.0.117", + "serde", ] [[package]] @@ -2815,5 +2758,5 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" dependencies = [ - "linked-hash-map 0.5.3", + "linked-hash-map", ] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 2f8ff3c83..36e313f8e 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -9,7 +9,7 @@ clap = "^2.33.0" taskchampion = { path = "../taskchampion" } failure = "^0.1.8" prettytable-rs = "^0.8.0" -config = "^0.10.1" +config = { version="^0.10.1", default-features=false, features=["yaml"] } dirs = "^3.0.1" [dev-dependencies] diff --git a/docs/src/usage.md b/docs/src/usage.md index 329cdf1eb..37123bfd2 100644 --- a/docs/src/usage.md +++ b/docs/src/usage.md @@ -11,7 +11,7 @@ Note that the `task` interface does not match that of TaskWarrior. The `task` command will work out-of-the-box with no configuration file, using default values. -Configuration is read from `taskchampion.yaml` (or `taskchampion.toml` or `taskchmapion.json` if you prefer) in your config directory. +Configuration is read from `taskchampion.yaml` in your config directory. On Linux systems, that directory is `~/.config`. On OS X, it's `~/Library/Preferences`. On Windows, it's `AppData/Roaming` in your home directory.