diff --git a/Cargo.lock b/Cargo.lock index c86f34fd..5bebfd32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "arbitrary" @@ -104,7 +104,7 @@ checksum = "edf3ee19dbc0a46d740f6f0926bde8c50f02bdbc7b536842da28f6ac56513a8b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -178,7 +178,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror 2.0.8", + "thiserror", ] [[package]] @@ -230,7 +230,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -346,7 +346,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -357,7 +357,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -377,7 +377,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -398,7 +398,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -408,7 +408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -425,7 +425,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -695,7 +695,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -1219,7 +1219,7 @@ dependencies = [ "smallvec", "static_assertions", "test-case", - "thiserror 1.0.69", + "thiserror", "vector-map", ] @@ -1234,7 +1234,7 @@ dependencies = [ "pretty_assertions", "proptest", "test-case", - "thiserror 1.0.69", + "thiserror", "unicode-width", ] @@ -1358,14 +1358,14 @@ checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", "memchr", @@ -1474,9 +1474,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.90" +version = "2.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035" dependencies = [ "proc-macro2", "quote", @@ -1491,7 +1491,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -1535,7 +1535,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -1546,48 +1546,28 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", "test-case-core", ] [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" -dependencies = [ - "thiserror-impl 2.0.8", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", + "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.8" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -2029,7 +2009,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", "synstructure", ] @@ -2051,7 +2031,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -2071,7 +2051,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", "synstructure", ] @@ -2094,5 +2074,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] diff --git a/Cargo.toml b/Cargo.toml index 678e0932..40a42334 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ rsonpath-syntax = { version = "0.3.1", path = "./crates/rsonpath-syntax" } arbitrary = { version = "1.4.1" } cfg-if = "1.0.0" log = "0.4.22" -thiserror = "1.0.66" +thiserror = "2.0.9" # Dev-dependencies itertools = "0.13.0" pretty_assertions = "1.4.1" diff --git a/crates/rsonpath-benchmarks/Cargo.toml b/crates/rsonpath-benchmarks/Cargo.toml index aaa398db..e8ca087c 100644 --- a/crates/rsonpath-benchmarks/Cargo.toml +++ b/crates/rsonpath-benchmarks/Cargo.toml @@ -31,7 +31,7 @@ jni = { version = "0.21.1", features = ["invocation", "default"] } jsonpath-rust = "0.7.3" libc = "0.2.168" lazy_static = "1.5.0" -serde_json = "1.0.133" +serde_json = "1.0.134" sha2 = "0.10.8" ouroboros = "0.18.4" reqwest = { version = "0.12.9", features = ["blocking"] } @@ -39,7 +39,7 @@ rsonpath-lib = { version = "0.9.1", default-features = false } rsonpath-syntax = { version = "0.3.1", default-features = false } serde_json_path = "0.7.1" tar = "0.4.43" -thiserror = "1.0.64" +thiserror = "2.0.9" [patch.crates-io] rsonpath-lib = { path = "../rsonpath-lib" } diff --git a/crates/rsonpath-benchmarks/src/dataset.rs b/crates/rsonpath-benchmarks/src/dataset.rs index e70f151b..cc7b4b89 100644 --- a/crates/rsonpath-benchmarks/src/dataset.rs +++ b/crates/rsonpath-benchmarks/src/dataset.rs @@ -523,13 +523,13 @@ pub enum DatasetError { #[error( "Checksum validation failed. \ The URL source might be corrupted. \ - Expected JSON from {0} to have SHA2 checksum of {}, but it has {}.", format_hex_string(.1), format_hex_string(.2) + Expected JSON from {0} to have SHA2 checksum of {exp}, but it has {act}.", exp = format_hex_string(.1), act = format_hex_string(.2) )] InvalidJsonChecksum(&'static str, Sha256Digest, Sha256Digest), #[error( "Checksum validation failed. \ The URL source might be corrupted. \ - Expected archive from {0} to have SHA2 checksum of {}, but it has {}.", format_hex_string(.1), format_hex_string(.2) + Expected archive from {0} to have SHA2 checksum of {exp}, but it has {act}.", exp = format_hex_string(.1), act = format_hex_string(.2) )] InvalidArchiveChecksum(&'static str, Sha256Digest, Sha256Digest), } diff --git a/crates/rsonpath-benchmarks/src/implementations/jsurferShim/.gitignore b/crates/rsonpath-benchmarks/src/implementations/jsurferShim/.gitignore index df223264..1468c7b1 100644 --- a/crates/rsonpath-benchmarks/src/implementations/jsurferShim/.gitignore +++ b/crates/rsonpath-benchmarks/src/implementations/jsurferShim/.gitignore @@ -1,5 +1,6 @@ # Ignore Gradle project-specific cache directory .gradle +gradle/wrapper/gradle-wrapper.jar # Ignore Gradle build output directory build diff --git a/crates/rsonpath-benchmarks/src/implementations/jsurferShim/gradle/wrapper/gradle-wrapper.jar b/crates/rsonpath-benchmarks/src/implementations/jsurferShim/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 249e5832..00000000 Binary files a/crates/rsonpath-benchmarks/src/implementations/jsurferShim/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 8e4d76d1..8667c2bc 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -320,18 +320,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.69" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote",