Bump clap from 3.0.0-beta.5 to 3.0.6

Cargo.lock

@@ -54,9 +54,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "3.0.0-beta.5"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63"
+checksum = "1957aa4a5fb388f0a0a73ce7556c5b42025b874e5cdc2c670775e346e97adec0"
 dependencies = [
  "atty",
  "bitflags",
@@ -67,14 +67,13 @@ dependencies = [
  "strsim",
  "termcolor",
  "textwrap",
- "unicase",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0-beta.5"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3"
+checksum = "517358c28fcef6607bf6f76108e02afad7e82297d132a6b846dcc1fc3efcd153"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -208,12 +207,9 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-dependencies = [
- "unicode-segmentation",
-]
 
 [[package]]
 name = "hermit-abi"
@@ -357,9 +353,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "4.2.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799"
+checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
 dependencies = [
  "memchr",
 ]
@@ -713,9 +709,6 @@ name = "textwrap"
 version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
-dependencies = [
- "unicode-width",
-]
 
 [[package]]
 name = "thiserror"
@@ -737,27 +730,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.2"

Cargo.toml

@@ -16,7 +16,7 @@ travis-ci = { repository = "denisidoro/navi", branch = "master" }
 
 [dependencies]
 regex = { version = "1.5.4", default-features = false, features = ["std", "unicode-perl"] }
-clap = "3.0.0-beta.5"
+clap = { version = "3.0.6", features = ["derive", "cargo"] }
 crossterm = "0.22.1"
 lazy_static = "1.4.0"
 directories-next = "2.0.0"

docs/installation.md

@@ -37,7 +37,7 @@ nix-env -iA nixpkgs.navi
 #### Using [cargo](https://github.com/rust-lang/cargo)
 
 ```bash
-cargo install navi
+cargo install --locked navi
 ```
 
 #### Using install script

src/config/cli.rs

@@ -1,4 +1,3 @@
-use crate::env_var;
 use crate::finder::FinderChoice;
 use crate::handler::func::Func;
 use crate::handler::info::Info;
@@ -89,11 +88,11 @@ impl FromStr for Info {
     navi --fzf-overrides '--nth 1,2'             # only consider the first two columns for search
     navi --fzf-overrides '--no-exact'            # use looser search algorithm
     navi --tag-rules='git,!checkout'             # show non-checkout git snippets only")]
-#[clap(setting = AppSettings::AllowLeadingHyphen)]
+#[clap(setting = AppSettings::AllowHyphenValues)]
 #[clap(version = crate_version!())]
 pub(super) struct ClapConfig {
     /// Colon-separated list of paths containing .cheat files
-    #[clap(short, long, env = env_var::PATH)]
+    #[clap(short, long)]
     pub path: Option<String>,
 
     /// Instead of executing a snippet, prints it to stdout
@@ -129,7 +128,7 @@ pub(super) struct ClapConfig {
     pub fzf_overrides_var: Option<String>,
 
     /// Finder application to use
-    #[clap(long, possible_values = FINDER_POSSIBLE_VALUES, case_insensitive = true)]
+    #[clap(long, possible_values = FINDER_POSSIBLE_VALUES, ignore_case = true)]
     pub finder: Option<FinderChoice>,
 
     #[clap(subcommand)]
@@ -147,7 +146,7 @@ pub enum Command {
     /// [Experimental] Calls internal functions
     Fn {
         /// Function name (example: "url::open")
-        #[clap(possible_values = FUNC_POSSIBLE_VALUES, case_insensitive = true)]
+        #[clap(possible_values = FUNC_POSSIBLE_VALUES, ignore_case = true)]
         func: Func,
         /// List of arguments (example: "https://google.com")
         args: Vec<String>,
@@ -178,12 +177,12 @@ pub enum Command {
     PreviewVarStdin,
     /// Outputs shell widget source code
     Widget {
-        #[clap(possible_values = WIDGET_POSSIBLE_VALUES, case_insensitive = true, default_value = "bash")]
+        #[clap(possible_values = WIDGET_POSSIBLE_VALUES, ignore_case = true, default_value = "bash")]
         shell: Shell,
     },
     /// Shows info
     Info {
-        #[clap(possible_values = INFO_POSSIBLE_VALUES, case_insensitive = true)]
+        #[clap(possible_values = INFO_POSSIBLE_VALUES, ignore_case = true)]
         info: Info,
     },
 }