diff --git a/Cargo.lock b/Cargo.lock index 6a1322c..3233530 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,6 +54,54 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +dependencies = [ + "anstyle", + "windows-sys", +] + [[package]] name = "anyhow" version = "1.0.72" @@ -195,7 +243,7 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags 1.3.2", - "clap_lex", + "clap_lex 0.2.4", "indexmap 1.9.3", "once_cell", "strsim", @@ -203,13 +251,34 @@ dependencies = [ "textwrap", ] +[[package]] +name = "clap" +version = "4.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.5.1", + "strsim", +] + [[package]] name = "clap_complete" version = "3.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" dependencies = [ - "clap", + "clap 3.2.25", ] [[package]] @@ -221,6 +290,18 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "core-foundation-sys" version = "0.8.4" @@ -845,7 +926,7 @@ dependencies = [ "ammonia", "anyhow", "chrono", - "clap", + "clap 3.2.25", "clap_complete", "elasticlunr-rs", "env_logger 0.9.3", @@ -873,7 +954,7 @@ dependencies = [ name = "mdbook-catppuccin" version = "1.0.0" dependencies = [ - "clap", + "clap 4.4.3", "env_logger 0.10.0", "log", "mdbook", @@ -1825,6 +1906,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "version-compare" version = "0.1.1" diff --git a/Cargo.toml b/Cargo.toml index 16994d5..005e699 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ name = "mdbook_catppuccin" path = "src/lib.rs" [dependencies] -clap = { version = "3.2.25", features = ["cargo"] } +clap = { version = "4.4.3", features = ["cargo"] } mdbook = "=0.4.22" env_logger = "0.10.0" log = "0.4.20" diff --git a/src/bin/mdbook-catppuccin.rs b/src/bin/mdbook-catppuccin.rs index 9aa8ce1..7a2932e 100644 --- a/src/bin/mdbook-catppuccin.rs +++ b/src/bin/mdbook-catppuccin.rs @@ -1,6 +1,6 @@ use std::{io, process}; -use clap::{crate_version, Arg, ArgMatches, Command}; +use clap::{command, crate_version, Arg, ArgMatches, Command}; use mdbook::errors::Error; use mdbook::preprocess::{CmdPreprocessor, Preprocessor}; use semver::{Version, VersionReq}; @@ -23,8 +23,9 @@ fn main() { } } -pub fn make_app() -> Command<'static> { - Command::new("mdbook-catppuccin") +pub fn make_app() -> Command { + command!() + .name("mdbook-catppuccin") .about("A mdbook preprocessor that implements catppuccin flavours as default themes") .version(crate_version!()) .subcommand( @@ -66,10 +67,11 @@ fn handle_preprocessing(pre: &Catppuccin) -> Result<(), Error> { } fn handle_supports(pre: &Catppuccin, sub_args: &ArgMatches) -> ! { - let renderer = sub_args.value_of("renderer").expect("Required argument"); - let supported = pre.supports_renderer(renderer); + let renderer = sub_args + .get_one::<&str>("renderer") + .expect("Required argument"); - if supported { + if pre.supports_renderer(renderer) { process::exit(0); } else { process::exit(1);