Merge #656

656: clap4 & irx-config r=therealprof a=burrbull



Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Update `clap` to 4.0, use `irx-config` instead of `clap_conf`
 - Add #[must_use] to prevent hanging field writers
 
 ## [v0.26.0] - 2022-10-07

Cargo.toml

@@ -38,20 +38,21 @@ required-features = ["bin"]
 
 [features]
 default = ["bin", "json", "yaml"]
-bin = ["dep:clap", "dep:clap_conf", "dep:env_logger"]
+bin = ["dep:clap", "dep:env_logger", "serde", "dep:irx-config"]
 json = ["dep:serde_json"]
 yaml = ["dep:serde_yaml"]
 
 [dependencies]
-clap = { version = "2.34", optional = true }
-clap_conf = { version = "0.1.5", optional = true }
+clap = { version = "4.0", optional = true }
+irx-config = { version = "3.1", features = ["cmd", "toml-parser"], optional = true }
 env_logger = { version = "0.9", optional = true }
 inflections = "1.1"
 log = { version = "~0.4", features = ["std"] }
 quote = "1.0"
 proc-macro2 = "1.0"
 anyhow = "1.0"
 thiserror = "1.0"
+serde = { version = "1.0", optional = true }
 serde_json = { version = "1.0.85", optional = true }
 serde_yaml = { version = "0.9.11", optional = true }