update to latestst clap beta (#63)

davidkna · Oct 17, 2021 · 73493b0 · 73493b0
1 parent b920352
commit 73493b0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ default = ["clap"]
 
 [dependencies]
 bstr = "0.2.17"
-clap = { version = "3.0.0-beta.4", optional = true }
+clap = { version = "3.0.0-beta.5", optional = true }
 colorgrad = "0.5.0"
 fastrand = "1.5.0"
 unicode-segmentation = "1.8.0"

diff --git a/src/main.rs b/src/main.rs
@@ -1,6 +1,6 @@
 #![warn(clippy::pedantic, clippy::nursery)]
 
-use clap::Clap;
+use clap::Parser;
 use lcat::{Rainbow, RainbowCmd};
 use std::{
     fs::File,
@@ -12,7 +12,7 @@ use std::{
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-#[derive(Clap)]
+#[derive(Parser)]
 #[clap(name = "lcat", about = "Terminal rainbows.")]
 pub struct Cmdline {
     #[clap(name = "File", default_value = "-", parse(from_os_str))]

diff --git a/src/rainbow_cmd.rs b/src/rainbow_cmd.rs
@@ -1,14 +1,14 @@
 use crate::{Grad, HsvGrad, Rainbow};
-use clap::{ArgEnum, Clap};
+use clap::{ArgEnum, Parser};
 
-#[derive(Debug, ArgEnum)]
+#[derive(Debug, Clone, ArgEnum)]
 pub enum RainbowStyle {
     Rainbow,
     Sinebow,
     OkHsv,
 }
 
-#[derive(Debug, Clap)]
+#[derive(Debug, Parser)]
 pub struct RainbowCmd {
     ///  How many degrees to shift text color hue for every column
     #[clap(short = 'C', long, default_value = "1.6")]