From dbd8294b1aab9030e17df827a46212ec5a5d50ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 21 Sep 2024 01:05:15 +0000 Subject: [PATCH 1/2] Bump jsonschema from 0.18.0 to 0.20.0 Bumps [jsonschema](https://github.com/Stranger6667/jsonschema-rs) from 0.18.0 to 0.20.0. - [Release notes](https://github.com/Stranger6667/jsonschema-rs/releases) - [Changelog](https://github.com/Stranger6667/jsonschema-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stranger6667/jsonschema-rs/compare/rust-v0.18.0...rust-v0.20.0) --- updated-dependencies: - dependency-name: jsonschema dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 29 ++++++++++++++++++++++++++--- serde_with/Cargo.toml | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b40e4038..fac52d43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -417,9 +417,9 @@ dependencies = [ [[package]] name = "jsonschema" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0afd06142c9bcb03f4a8787c77897a87b6be9c4918f1946c33caa714c27578" +checksum = "f2eef4e82b548e08ac880d307c8e8838b45f497a08d3202f3b26c9debaed8058" dependencies = [ "ahash", "anyhow", @@ -440,7 +440,7 @@ dependencies = [ "serde_json", "time", "url", - "uuid", + "uuid-simd", ] [[package]] @@ -596,6 +596,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1143,6 +1149,17 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +[[package]] +name = "uuid-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b082222b4f6619906941c17eb2297fff4c2fb96cb60164170522942a200bd8" +dependencies = [ + "outref", + "uuid", + "vsimd", +] + [[package]] name = "version-sync" version = "0.9.5" @@ -1164,6 +1181,12 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/serde_with/Cargo.toml b/serde_with/Cargo.toml index c8427997..b9f34959 100644 --- a/serde_with/Cargo.toml +++ b/serde_with/Cargo.toml @@ -140,7 +140,7 @@ time_0_3 = {package = "time", version = "~0.3.36", optional = true, default-feat expect-test = "1.5.0" fnv = "1.0.6" glob = "0.3.0" -jsonschema = { version = "0.18.0", default-features = false, features = ["resolve-file"] } +jsonschema = { version = "0.20.0", default-features = false, features = ["resolve-file"] } mime = "0.3.16" pretty_assertions = "1.4.0" regex = {version = "1.10.3", default-features = false, features = ["std"]} From 368baf3ea362767230575ef9a88442046ef96464 Mon Sep 17 00:00:00 2001 From: Jonas Bushart Date: Sat, 21 Sep 2024 14:42:36 +0200 Subject: [PATCH 2/2] Use new Validator nameing for jsonschema --- serde_with/tests/utils.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/serde_with/tests/utils.rs b/serde_with/tests/utils.rs index 7eb50bd2..530a011d 100644 --- a/serde_with/tests/utils.rs +++ b/serde_with/tests/utils.rs @@ -83,13 +83,12 @@ pub fn check_matches_schema(value: &serde_json::Value) where T: schemars_0_8::JsonSchema, { - use jsonschema::JSONSchema; use std::fmt::Write; if cfg!(feature = "schemars_0_8") { let schema_object = serde_json::to_value(schemars_0_8::schema_for!(T)) .expect("schema for T could not be serialized to json"); - let schema = match JSONSchema::compile(&schema_object) { + let schema = match jsonschema::Validator::new(&schema_object) { Ok(schema) => schema, Err(e) => panic!("schema for T was not a valid JSON schema: {e}"), };