Merge pull request skim-rs#489 from anthraxx/fix/clap-version-option

Cargo.toml

@@ -29,7 +29,7 @@ unicode-width = "0.1.9"
 log = "0.4.17"
 env_logger = { version = "0.9.0", optional = true }
 time = "0.3.13"
-clap = { version = "3.2.22", optional = true }
+clap = { version = "3.2.22", optional = true, features = ["cargo"] }
 tuikit = "0.5.0"
 vte = "0.11.0"
 fuzzy-matcher = "0.3.7"

src/bin/main.rs

@@ -12,11 +12,9 @@ use std::env;
 use std::fs::File;
 use std::io::{BufRead, BufReader, BufWriter, Write};
 
-use clap::{App, Arg, ArgMatches};
+use clap::{crate_version, App, Arg, ArgMatches};
 use skim::prelude::*;
 
-const VERSION: &str = env!("CARGO_PKG_VERSION");
-
 const USAGE: &str = "
 Usage: sk [options]
 
@@ -171,8 +169,8 @@ fn real_main() -> Result<i32, std::io::Error> {
     // parse options
     let opts = App::new("sk")
         .author("Jinzhou Zhang<[email protected]>")
+        .version(crate_version!())
         .arg(Arg::with_name("help").long("help").short('h'))
-        .arg(Arg::with_name("version").long("version").short('v'))
         .arg(Arg::with_name("bind").long("bind").short('b').multiple(true).takes_value(true))
         .arg(Arg::with_name("multi").long("multi").short('m').multiple(true))
         .arg(Arg::with_name("no-multi").long("no-multi").multiple(true))
@@ -249,11 +247,6 @@ fn real_main() -> Result<i32, std::io::Error> {
         return Ok(0);
     }
 
-    if opts.is_present("version") {
-        writeln!(stdout, "{}", VERSION)?;
-        return Ok(0);
-    }
-
     //------------------------------------------------------------------------------
     let mut options = parse_options(&opts);