bump clap version to 3.x.x

Cargo.lock

@@ -13,15 +13,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -65,17 +56,26 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "2.34.0"
+version = "3.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
 dependencies = [
- "ansi_term",
  "atty",
  "bitflags",
+ "clap_lex",
+ "indexmap",
  "strsim",
+ "termcolor",
  "textwrap",
- "unicode-width",
+]
- "vec_map",
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
 ]
 
 [[package]]
@@ -254,6 +254,12 @@ version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
+[[package]]
+name = "os_str_bytes"
+version = "6.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
+
 [[package]]
 name = "paste"
 version = "1.0.12"
@@ -395,9 +401,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
 
 [[package]]
 name = "strsim"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
@@ -424,32 +430,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "textwrap"
+name = "termcolor"
-version = "0.11.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
 dependencies = [
- "unicode-width",
+ "winapi-util",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
 
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -532,6 +532,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"

crates/lib/Cargo.toml

@@ -32,7 +32,7 @@ rustdoc-args = ["--cfg", "doc_cfg"]
 [dependencies]
 grass_compiler = { path = "../compiler", version = "=0.13.0", default-features = false }
 include_sass = { path = "../include_sass", version = "0.13.0", optional = true }
-clap = { version = "2.34.0", optional = true }
+clap = { version = "3.2.23", optional = true }
 
 [features]
 # todo: no commandline by default

crates/lib/src/main.rs

@@ -8,7 +8,6 @@ use clap::{arg_enum, App, AppSettings, Arg};
 
 use grass::{from_path, from_string, Options, OutputStyle};
 
-// TODO remove this
 arg_enum! {
     #[derive(Eq, PartialEq, Debug)]
     pub enum Style {
@@ -30,7 +29,7 @@ fn main() -> std::io::Result<()> {
         .setting(AppSettings::ColoredHelp)
         .version(env!("CARGO_PKG_VERSION"))
         .about("A near-feature-complete Sass compiler written purely in Rust")
-        .version_short("v")
+        .version_short('v')
         .arg(
             Arg::with_name("STDIN")
                 .long("stdin")
@@ -44,7 +43,7 @@ fn main() -> std::io::Result<()> {
         )
         .arg(
             Arg::with_name("LOAD_PATH")
-                .short("I")
+                .short('I')
                 .long("load-path")
                 .help("A path to use when resolving imports. May be passed multiple times.")
                 .multiple(true)
@@ -54,8 +53,8 @@ fn main() -> std::io::Result<()> {
         .arg(
             Arg::with_name("STYLE")
                 // this is required for compatibility with ruby sass
-                .short("t") // FIXME change this to short_alias later
+                .short_alias('t')
-                .short("s")
+                .short('s')
                 .long("style")
                 .help("Minified or expanded output")
                 .default_value("expanded")
@@ -131,14 +130,14 @@ fn main() -> std::io::Result<()> {
         )
         .arg(
             Arg::with_name("INTERACTIVE")
-                .short("i")
+                .short('i')
                 .long("interactive")
                 .hidden(true)
                 .help("Run an interactive SassScript shell.")
         )
         .arg(
             Arg::with_name("NO_COLOR")
-                .short("c")
+                .short('c')
                 .long("no-color")
                 .hidden(true)
                 .help("Whether to use terminal colors for messages.")
@@ -156,7 +155,7 @@ fn main() -> std::io::Result<()> {
         )
         .arg(
             Arg::with_name("QUIET")
-                .short("q")
+                .short('q')
                 .long("quiet")
                 .help("Don't print warnings."),
         )