From 836559779b4ceff16ce5760116fe55c01ea44f81 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Jun 2025 01:31:08 +0000 Subject: [PATCH] chore(deps): Update Rust crate schemars to 0.9.0 --- Cargo.lock | 57 +++++---- config.schema.json | 226 ++++++++++++++++----------------- crates/typos-cli/Cargo.toml | 2 +- crates/typos-cli/src/config.rs | 8 +- 4 files changed, 143 insertions(+), 150 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 06e5019f..5eb41e53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -629,12 +629,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.15.0" @@ -701,17 +695,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - [[package]] name = "indexmap" version = "2.9.0" @@ -719,7 +702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown", ] [[package]] @@ -1028,6 +1011,26 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "ref-cast" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "regex" version = "1.11.1" @@ -1132,12 +1135,12 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.22" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" dependencies = [ "dyn-clone", - "indexmap 1.9.3", + "ref-cast", "schemars_derive", "semver", "serde", @@ -1146,9 +1149,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.22" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" +checksum = "5016d94c77c6d32f0b8e08b781f7dc8a90c2007d4e77472cc2807bc10a8438fe" dependencies = [ "proc-macro2", "quote", @@ -1167,9 +1170,6 @@ name = "semver" version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" -dependencies = [ - "serde", -] [[package]] name = "serde" @@ -1228,6 +1228,7 @@ version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ + "indexmap", "itoa", "memchr", "ryu", @@ -1447,7 +1448,7 @@ version = "0.22.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" dependencies = [ - "indexmap 2.9.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -1577,7 +1578,7 @@ dependencies = [ "divan", "edit-distance", "heck", - "indexmap 2.9.0", + "indexmap", "itertools 0.14.0", "phf", "snapbox", diff --git a/config.schema.json b/config.schema.json index ce239ec0..006aa098 100644 --- a/config.schema.json +++ b/config.schema.json @@ -1,112 +1,104 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Config", "type": "object", "properties": { - "files": { - "default": { - "extend-exclude": [], - "ignore-dot": null, - "ignore-files": null, - "ignore-global": null, - "ignore-hidden": null, - "ignore-parent": null, - "ignore-vcs": null - }, - "allOf": [ - { - "$ref": "#/definitions/Walk" - } - ] - }, - "default": { - "default": { - "binary": null, - "check-file": null, - "check-filename": null, - "extend-identifiers": {}, - "extend-ignore-identifiers-re": [], - "extend-ignore-re": [], - "extend-ignore-words-re": [], - "extend-words": {}, - "identifier-leading-digits": null, - "ignore-hex": null, - "locale": null, - "unicode": null - }, - "allOf": [ - { - "$ref": "#/definitions/EngineConfig" - } - ] - }, "type": { - "default": {}, "type": "object", "additionalProperties": { - "$ref": "#/definitions/GlobEngineConfig" + "$ref": "#/$defs/GlobEngineConfig" + }, + "default": {} + }, + "files": { + "$ref": "#/$defs/Walk", + "default": { + "extend-exclude": [], + "ignore-hidden": null, + "ignore-files": null, + "ignore-dot": null, + "ignore-vcs": null, + "ignore-global": null, + "ignore-parent": null + } + }, + "default": { + "$ref": "#/$defs/EngineConfig", + "default": { + "binary": null, + "check-filename": null, + "check-file": null, + "unicode": null, + "ignore-hex": null, + "identifier-leading-digits": null, + "locale": null, + "extend-ignore-identifiers-re": [], + "extend-identifiers": {}, + "extend-ignore-words-re": [], + "extend-words": {}, + "extend-ignore-re": [] } } }, "additionalProperties": false, - "definitions": { + "$defs": { "Walk": { "type": "object", "properties": { "extend-exclude": { - "default": [], "type": "array", "items": { "type": "string" - } + }, + "default": [] }, "ignore-hidden": { "description": "Skip hidden files and directories.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "ignore-files": { "description": "Respect ignore files.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "ignore-dot": { "description": "Respect .ignore files.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "ignore-vcs": { "description": "Respect ignore files in vcs directories.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "ignore-global": { "description": "Respect global ignore files.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "ignore-parent": { "description": "Respect ignore files in parent directories.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null } }, "additionalProperties": false @@ -116,97 +108,97 @@ "properties": { "binary": { "description": "Check binary files.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "check-filename": { "description": "Verifying spelling in file names.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "check-file": { "description": "Verifying spelling in files.", - "default": null, "type": [ "boolean", "null" - ] - }, - "extend-ignore-re": { - "default": [], - "type": "array", - "items": { - "type": "string" - } + ], + "default": null }, "unicode": { "description": "Allow unicode characters in identifiers (and not just ASCII)", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "ignore-hex": { "description": "Do not check identifiers that appear to be hexadecimal values.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "identifier-leading-digits": { "description": "Allow identifiers to start with digits, in addition to letters.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "locale": { - "default": null, "anyOf": [ { - "$ref": "#/definitions/Locale" + "$ref": "#/$defs/Locale" }, { "type": "null" } - ] + ], + "default": null }, "extend-ignore-identifiers-re": { - "default": [], "type": "array", "items": { "type": "string" - } + }, + "default": [] }, "extend-identifiers": { - "default": {}, "type": "object", "additionalProperties": { "type": "string" - } + }, + "default": {} }, "extend-ignore-words-re": { - "default": [], "type": "array", "items": { "type": "string" - } + }, + "default": [] }, "extend-words": { - "default": {}, "type": "object", "additionalProperties": { "type": "string" - } + }, + "default": {} + }, + "extend-ignore-re": { + "type": "array", + "items": { + "type": "string" + }, + "default": [] } } }, @@ -224,105 +216,105 @@ "type": "object", "properties": { "extend-glob": { - "default": [], "type": "array", "items": { "type": "string" - } + }, + "default": [] }, "binary": { "description": "Check binary files.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "check-filename": { "description": "Verifying spelling in file names.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "check-file": { "description": "Verifying spelling in files.", - "default": null, "type": [ "boolean", "null" - ] - }, - "extend-ignore-re": { - "default": [], - "type": "array", - "items": { - "type": "string" - } + ], + "default": null }, "unicode": { "description": "Allow unicode characters in identifiers (and not just ASCII)", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "ignore-hex": { "description": "Do not check identifiers that appear to be hexadecimal values.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "identifier-leading-digits": { "description": "Allow identifiers to start with digits, in addition to letters.", - "default": null, "type": [ "boolean", "null" - ] + ], + "default": null }, "locale": { - "default": null, "anyOf": [ { - "$ref": "#/definitions/Locale" + "$ref": "#/$defs/Locale" }, { "type": "null" } - ] + ], + "default": null }, "extend-ignore-identifiers-re": { - "default": [], "type": "array", "items": { "type": "string" - } + }, + "default": [] }, "extend-identifiers": { - "default": {}, "type": "object", "additionalProperties": { "type": "string" - } + }, + "default": {} }, "extend-ignore-words-re": { - "default": [], "type": "array", "items": { "type": "string" - } + }, + "default": [] }, "extend-words": { - "default": {}, "type": "object", "additionalProperties": { "type": "string" - } + }, + "default": {} + }, + "extend-ignore-re": { + "type": "array", + "items": { + "type": "string" + }, + "default": [] } } } diff --git a/crates/typos-cli/Cargo.toml b/crates/typos-cli/Cargo.toml index 14124deb..1212e591 100644 --- a/crates/typos-cli/Cargo.toml +++ b/crates/typos-cli/Cargo.toml @@ -78,7 +78,7 @@ serde_regex = "1.1.0" regex = "1.10.4" encoding_rs = "0.8.34" serde-sarif = "0.7.0" -schemars = { version = "0.8.21", features = ["preserve_order","semver"], optional = true } +schemars = { version = "0.9.0", features = ["preserve_order","semver1"], optional = true } [dev-dependencies] assert_fs = "1.1" diff --git a/crates/typos-cli/src/config.rs b/crates/typos-cli/src/config.rs index ab301a2d..1be1ade5 100644 --- a/crates/typos-cli/src/config.rs +++ b/crates/typos-cli/src/config.rs @@ -633,21 +633,21 @@ impl std::fmt::Display for Locale { } #[cfg(feature = "unstable-schema")] -fn vec_string(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema { +fn vec_string(gen: &mut schemars::SchemaGenerator) -> schemars::Schema { type Type = Vec; ::json_schema(gen) } #[cfg(feature = "unstable-schema")] -fn hashmap_string_string(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema { +fn hashmap_string_string(gen: &mut schemars::SchemaGenerator) -> schemars::Schema { type Type = HashMap; ::json_schema(gen) } #[cfg(feature = "unstable-schema")] fn hashmap_string_t( - gen: &mut schemars::gen::SchemaGenerator, -) -> schemars::schema::Schema { + gen: &mut schemars::SchemaGenerator, +) -> schemars::Schema { type Type = HashMap; as schemars::JsonSchema>::json_schema(gen) }