Merge pull request #84 from hearth-rs/downgrade-clap

Downgrade clap
hearth-rs · Mar 15, 2023 · 7cf22a2 · 7cf22a2
2 parents f6944f8 + 3ce898b
commit 7cf22a2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/crates/hearth-client/Cargo.toml b/crates/hearth-client/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "AGPL-3.0-or-later"
 
 [dependencies]
-clap = { version= "4", features = ["derive"] }
+clap = { version= "3.2", features = ["derive"] }
 hearth-cognito = { workspace = true }
 hearth-core = { workspace = true }
 hearth-ipc = { workspace = true }

diff --git a/crates/hearth-client/src/main.rs b/crates/hearth-client/src/main.rs
@@ -33,11 +33,11 @@ use tracing::{debug, error, info};
 pub struct Args {
     /// IP address and port of the server to connect to.
     // TODO support DNS resolution too
-    #[arg(short, long)]
+    #[clap(short, long)]
     pub server: String,
 
     /// Password to use to authenticate to the server. Defaults to empty.
-    #[arg(short, long, default_value = "")]
+    #[clap(short, long, default_value = "")]
     pub password: String,
 }
 

diff --git a/crates/hearth-ctl/Cargo.toml b/crates/hearth-ctl/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "AGPL-3.0-or-later"
 
 [dependencies]
-clap = { version = "4.1", features = ["derive"] }
+clap = { version = "3.2", features = ["derive"] }
 hearth-ipc = { workspace = true }
 hearth-rpc = { workspace = true }
 tokio = { version = "1.24", features = ["macros", "net", "rt"] }
diff --git a/crates/hearth-ctl/src/list_processes.rs b/crates/hearth-ctl/src/list_processes.rs
@@ -23,7 +23,7 @@ use hearth_types::PeerId;
 /// Lists proccesses of either a singular peer or all peers in the space.
 #[derive(Debug, Parser)]
 pub struct ListProcesses {
-    #[arg(short, long, default_value = None)]
+    #[clap(short, long)]
     pub peer: Option<MaybeAllPeerId>,
 }
 

diff --git a/crates/hearth-ctl/src/main.rs b/crates/hearth-ctl/src/main.rs
@@ -25,7 +25,7 @@ mod list_processes;
 /// Command-line interface (CLI) for interacting with a Hearth daemon over IPC.
 #[derive(Debug, Parser)]
 pub struct Args {
-    #[command(subcommand)]
+    #[clap(subcommand)]
     pub command: Commands,
 }
 

diff --git a/crates/hearth-server/Cargo.toml b/crates/hearth-server/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "AGPL-3.0-or-later"
 
 [dependencies]
-clap = { version = "4", features = ["derive"] }
+clap = { version = "3.2", features = ["derive"] }
 hearth-cognito = { workspace = true }
 hearth-core = { workspace = true }
 hearth-ipc = { workspace = true }

diff --git a/crates/hearth-server/src/main.rs b/crates/hearth-server/src/main.rs
@@ -37,11 +37,11 @@ pub const SELF_PEER_ID: PeerId = PeerId(0);
 #[derive(Parser, Debug)]
 pub struct Args {
     /// IP address and port to listen on.
-    #[arg(short, long)]
+    #[clap(short, long)]
     pub bind: Option<SocketAddr>,
 
     /// Password to use to authenticate with clients. Defaults to empty.
-    #[arg(short, long, default_value = "")]
+    #[clap(short, long, default_value = "")]
     pub password: String,
 }