From 17191feb12952eecd16ba8e603661a4b8b4cc79e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 18:02:35 +0000 Subject: [PATCH 1/2] chore: bump clap from 4.1.10 to 4.2.0 Bumps [clap](https://github.com/clap-rs/clap) from 4.1.10 to 4.2.0. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.1.10...clap_complete-v4.2.0) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 108 +++++++++++++++++++++++++++------ prql-compiler/prqlc/Cargo.toml | 2 +- web/book/Cargo.toml | 2 +- 3 files changed, 91 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f80b8df6e23..f6628d828aaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,6 +65,46 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "anstream" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] + [[package]] name = "anyhow" version = "1.0.70" @@ -497,25 +537,40 @@ version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ + "atty", "bitflags 1.3.2", + "clap_derive 3.2.18", "clap_lex 0.2.4", "indexmap", + "once_cell", + "strsim", + "termcolor", "textwrap", ] [[package]] name = "clap" -version = "4.1.10" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce38afc168d8665cfc75c7b1dd9672e50716a137f433f070991619744a67342a" +checksum = "6efb5f0a41b5ef5b50c5da28c07609c20091df0c1fc33d418fa2a7e693c2b624" dependencies = [ + "clap_builder", + "clap_derive 4.2.0", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "671fcaa5debda4b9a84aa7fde49c907c8986c0e6ab927e04217c9cb74e7c8bc9" +dependencies = [ + "anstream", + "anstyle", "bitflags 1.3.2", - "clap_derive", - "clap_lex 0.3.3", - "is-terminal", + "clap_lex 0.4.1", "once_cell", "strsim", - "termcolor", "terminal_size", ] @@ -525,14 +580,14 @@ version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1" dependencies = [ - "clap 4.1.10", + "clap 4.2.0", ] [[package]] name = "clap_derive" -version = "4.1.9" +version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ "heck", "proc-macro-error", @@ -541,6 +596,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "clap_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.8", +] + [[package]] name = "clap_lex" version = "0.2.4" @@ -552,12 +619,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "clio" @@ -565,7 +629,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b38784f05c5e908bb8751e9b9f29fbcd470f636c0d0a76a0f90c0c823f3b68" dependencies = [ - "clap 4.1.10", + "clap 3.2.23", "libc", "windows-sys 0.42.0", ] @@ -653,7 +717,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "435ff0007a3bb04099fe1beedc6b76e7dd5340c90b168008ac0d7e87441de1bf" dependencies = [ - "clap 4.1.10", + "clap 4.2.0", "concolor", ] @@ -1606,7 +1670,7 @@ checksum = "764dcbfc2e5f868bc1b566eb179dff1a06458fd0cff846aae2579392dd3f01a0" dependencies = [ "anyhow", "chrono", - "clap 4.1.10", + "clap 4.2.0", "clap_complete", "env_logger", "handlebars", @@ -1629,7 +1693,7 @@ name = "mdbook-prql" version = "0.6.1" dependencies = [ "anyhow", - "clap 4.1.10", + "clap 4.2.0", "globset", "insta", "itertools", @@ -2201,7 +2265,7 @@ dependencies = [ "anyhow", "ariadne", "atty", - "clap 4.1.10", + "clap 4.2.0", "clio", "color-eyre", "concolor", @@ -3120,6 +3184,12 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "valuable" version = "0.1.0" diff --git a/prql-compiler/prqlc/Cargo.toml b/prql-compiler/prqlc/Cargo.toml index 9545799c8c4e..75fe64717f40 100644 --- a/prql-compiler/prqlc/Cargo.toml +++ b/prql-compiler/prqlc/Cargo.toml @@ -12,7 +12,7 @@ version.workspace = true anyhow = {version = "1.0.57"} ariadne = "0.2.0" atty = "0.2.14" -clap = {version = "4.1.1", features = ["derive"]} +clap = {version = "4.2.0", features = ["derive"]} clio = {version = "0.2.4", features = ['clap-parse']} color-eyre = "0.6.1" concolor = "0.1.0" diff --git a/web/book/Cargo.toml b/web/book/Cargo.toml index 349fdd567309..5e80f7f5cb80 100644 --- a/web/book/Cargo.toml +++ b/web/book/Cargo.toml @@ -31,7 +31,7 @@ walkdir = "2.3.2" # Possibly we should just put all dependencies as excluded from wasm? Currently # we only put the ones that break the build. [target.'cfg(not(target_family="wasm"))'.dependencies] -clap = {version = "4.1.1", default-features = false} +clap = {version = "4.2.0", default-features = false} mdbook = {version = "0.4.21", default-features = false} [dev-dependencies] From 604e228f8b07f08dd6f56bd0ac2cd0b49539672e Mon Sep 17 00:00:00 2001 From: Maximilian Roos Date: Wed, 29 Mar 2023 18:56:33 -0700 Subject: [PATCH 2/2] --- Cargo.lock | 46 ++-------------------------------------------- 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f6628d828aaa..1b114603d793 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -537,14 +537,9 @@ version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ - "atty", "bitflags 1.3.2", - "clap_derive 3.2.18", "clap_lex 0.2.4", "indexmap", - "once_cell", - "strsim", - "termcolor", "textwrap", ] @@ -555,7 +550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6efb5f0a41b5ef5b50c5da28c07609c20091df0c1fc33d418fa2a7e693c2b624" dependencies = [ "clap_builder", - "clap_derive 4.2.0", + "clap_derive", "once_cell", ] @@ -583,19 +578,6 @@ dependencies = [ "clap 4.2.0", ] -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "clap_derive" version = "4.2.0" @@ -629,7 +611,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b38784f05c5e908bb8751e9b9f29fbcd470f636c0d0a76a0f90c0c823f3b68" dependencies = [ - "clap 3.2.23", + "clap 4.2.0", "libc", "windows-sys 0.42.0", ] @@ -2134,30 +2116,6 @@ dependencies = [ "toml", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated"