chore(deps): update arg parsing to clap v3 (#1017)

* Update arg parsing to clap v3 * Ignore shell argument case
zellij-org · Jan 23, 2022 · e58b67c · e58b67c
1 parent 5f86dc4
commit e58b67c
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 127 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/main.rs b/src/main.rs
@@ -5,14 +5,14 @@ mod sessions;
 mod tests;
 
 use zellij_utils::{
+    clap::Parser,
     cli::{CliArgs, Command, Sessions},
     logging::*,
-    structopt::StructOpt,
 };
 
 fn main() {
     configure_logger();
-    let opts = CliArgs::from_args();
+    let opts = CliArgs::parse();
 
     if let Some(Command::Sessions(Sessions::ListSessions)) = opts.command {
         commands::list_sessions();

diff --git a/zellij-tile/Cargo.toml b/zellij-tile/Cargo.toml
@@ -7,6 +7,7 @@ description = "A small client-side library for writing Zellij plugins"
 license = "MIT"
 
 [dependencies]
+clap = { version = "3.0", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 strum = "0.20.0"

diff --git a/zellij-tile/src/data.rs b/zellij-tile/src/data.rs
@@ -1,3 +1,4 @@
+use clap::ArgEnum;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 use std::str::FromStr;
@@ -82,7 +83,7 @@ pub enum Event {
 }
 
 /// Describes the different input modes, which change the way that keystrokes will be interpreted.
-#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone, EnumIter, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone, EnumIter, Serialize, Deserialize, ArgEnum)]
 pub enum InputMode {
     /// In `Normal` mode, input is always written to the terminal, except for the shortcuts leading
     /// to other modes

diff --git a/zellij-utils/Cargo.toml b/zellij-utils/Cargo.toml
@@ -12,6 +12,8 @@ license = "MIT"
 anyhow = "1.0.45"
 backtrace = "0.3.55"
 bincode = "1.3.1"
+clap = { version = "3.0", features = ["derive", "env"] }
+clap_complete = "3.0"
 colored = "2.0.0"
 colorsys = "0.6.5"
 crossbeam = "0.8.0"
@@ -26,7 +28,6 @@ serde_yaml = "0.8"
 serde_json = "1.0"
 signal-hook = "0.3"
 strip-ansi-escapes = "0.1.0"
-structopt = "0.3"
 strum = "0.20.0"
 termion = "1.5.0"
 thiserror = "1.0.30"