Revert "Merge pull request #8 from manthanabc/master"

This reverts commit 725f998, reversing
changes made to 81dd744.

Author: kgilmer

trawlcat/Cargo.toml

@@ -11,6 +11,6 @@ repository = "https://github.com/regolith-linux/trawl"
 
 [dependencies]
 trawldb = "0.2.9"
-clap = { version = "4.5.24", features = ["derive"] }
+clap = { version = "3.2.8", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
 anyhow = "1.0.86"

trawlcat/src/main.rs

@@ -1,9 +1,9 @@
 use std::error::Error;
-use clap::Parser;
+use clap::{Parser, AppSettings};
 use trawlcat::rescat;
 
 #[derive(Parser)]
-#[clap(author, version, about, arg_required_else_help=true)]
+#[clap(author, version, about, setting(AppSettings::ArgRequiredElseHelp))]
 struct Args {
 
     /// resource name

trawld/Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/regolith-linux/trawl"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4.5.24", features = ["derive"] }
+clap = { version = "3.2.8", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
 zbus = { version = "4.3.1", default-features = false, features = ["tokio"] }
 colored = "2.0.0"

trawldb/Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/regolith-linux/trawl"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4.5.24", features = ["derive"] }
+clap = { version = "3.2.8", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
 zbus = { version = "4.3.1", default-features = false, features = ["tokio"] }
 

trawldb/src/parser.rs

@@ -1,7 +1,7 @@
-use clap::Parser;
+use clap::{AppSettings, Parser};
 
 #[derive(Parser, Debug, Clone, PartialEq, Eq)]
-#[clap(author, version, about, arg_required_else_help=true)]
+#[clap(author, version, about, setting(AppSettings::ArgRequiredElseHelp))]
 /// Config Manager Client for trawld
 pub struct CliArgs {
     /// load resources from file
@@ -53,7 +53,8 @@ pub struct CliArgs {
         short,
         long,
         value_parser,
-        num_args(0..=1),
+        min_values = 0,
+        max_values = 1,
         value_name = "string"
     )]
     pub query: Option<Vec<String>>,