From a5c1bcc0843efc176bf3d0fbfb9245da573009f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:15:50 +0000 Subject: [PATCH 1/3] build(deps): bump cbindgen from 0.20.0 to 0.26.0 Bumps [cbindgen](https://github.com/mozilla/cbindgen) from 0.20.0 to 0.26.0. - [Release notes](https://github.com/mozilla/cbindgen/releases) - [Changelog](https://github.com/mozilla/cbindgen/blob/master/CHANGES) - [Commits](https://github.com/mozilla/cbindgen/compare/v0.20.0...0.26.0) --- updated-dependencies: - dependency-name: cbindgen dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 84 ++++++++++++++++++++++++++++------------------------ c/Cargo.toml | 2 +- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4a7fa869..75b7b280 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,15 +23,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "antlr-rust" version = "0.3.0-beta" @@ -125,12 +116,12 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "cbindgen" -version = "0.20.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc" +checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" dependencies = [ "clap", - "heck 0.3.3", + "heck 0.4.0", "indexmap", "log", "proc-macro2", @@ -169,17 +160,26 @@ dependencies = [ [[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]] @@ -711,6 +711,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + [[package]] name = "parking_lot" version = "0.11.2" @@ -783,11 +789,11 @@ checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1079,9 +1085,9 @@ dependencies = [ [[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 = "strum" @@ -1198,6 +1204,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + [[package]] name = "test-runner" version = "0.0.11" @@ -1213,12 +1228,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.11.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" @@ -1303,6 +1315,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -1318,12 +1336,6 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - [[package]] name = "unicode-xid" version = "0.2.2" @@ -1376,12 +1388,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[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" diff --git a/c/Cargo.toml b/c/Cargo.toml index 1c87fc9c..45b1cc6e 100644 --- a/c/Cargo.toml +++ b/c/Cargo.toml @@ -9,7 +9,7 @@ crate-type = ["cdylib", "staticlib"] doc = false [build-dependencies] -cbindgen = "0.20.0" +cbindgen = "0.26.0" [dependencies] substrait-validator = { path = "../rs", version = "0.0.11" } From 2dbe42c9a12524241523af253f988d3a8bfa9556 Mon Sep 17 00:00:00 2001 From: Matthijs Brobbel Date: Mon, 4 Dec 2023 16:11:02 +0100 Subject: [PATCH 2/3] fix: breaking change --- c/build.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/c/build.rs b/c/build.rs index 9fbb2f53..6e9fef98 100644 --- a/c/build.rs +++ b/c/build.rs @@ -5,11 +5,9 @@ use std::env; fn main() { let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap(); - let mut config = cbindgen::Config { - cpp_compat: true, - language: cbindgen::Language::C, - ..Default::default() - }; + let mut config = cbindgen::Config::default(); + config.cpp_compat = true; + config.language = cbindgen::Language::C; config.export.prefix = Some("substrait_validator_".to_string()); config .export From 8ad8885e4fbb2f32efa1f42bd8c9cbc65b38f5b8 Mon Sep 17 00:00:00 2001 From: Matthijs Brobbel Date: Mon, 4 Dec 2023 16:11:09 +0100 Subject: [PATCH 3/3] fix: update patch file --- ci/version-diff-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/version-diff-template b/ci/version-diff-template index 26471f4a..937550ab 100644 --- a/ci/version-diff-template +++ b/ci/version-diff-template @@ -11,7 +11,7 @@ index 0e9b476..7165025 100644 license = "Apache-2.0" @@ -12,6 +12,6 @@ doc = false - cbindgen = "0.20.0" + cbindgen = "0.26.0" [dependencies] -substrait-validator = {{ path = "../rs", version = "{frm}" }}