Merge pull request #1390 from epage/update

chore: Update dependencies

Author: epage

Cargo.lock

@@ -3,13 +3,6 @@
   "title": "Config",
   "type": "object",
   "properties": {
-    "type": {
-      "type": "object",
-      "additionalProperties": {
-        "$ref": "#/$defs/GlobEngineConfig"
-      },
-      "default": {}
-    },
     "files": {
       "$ref": "#/$defs/Walk",
       "default": {
@@ -38,6 +31,10 @@
         "extend-words": {},
         "extend-ignore-re": []
       }
+    },
+    "type": {
+      "$ref": "#/$defs/TypeEngineConfig",
+      "default": {}
     }
   },
   "additionalProperties": false,
@@ -212,6 +209,12 @@
         "en-au"
       ]
     },
+    "TypeEngineConfig": {
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#/$defs/GlobEngineConfig"
+      }
+    },
     "GlobEngineConfig": {
       "type": "object",
       "properties": {

config.schema.json

@@ -21,7 +21,7 @@ dictgen = { version = "^0.4", path = "../dictgen" }
 [dev-dependencies]
 codegenrs = "3.0"
 dictgen = { version = "^0.4", path = "../dictgen", features = ["codegen"] }
-snapbox = "0.6.5"
+snapbox = "0.6.21"
 typos = { path = "../typos" }
 
 [lints]

crates/codespell-dict/Cargo.toml

@@ -23,9 +23,9 @@ aho-corasick = ["dep:aho-corasick"]
 
 [dependencies]
 unicase = "2.8.1"
-phf = { version = "0.12", features = ["unicase"], optional = true }
-phf_shared = { version = "0.12", optional = true }
-phf_codegen = { version = "0.12", optional = true }
+phf = { version = "0.13", features = ["unicase"], optional = true }
+phf_shared = { version = "0.13", optional = true }
+phf_codegen = { version = "0.13", optional = true }
 aho-corasick = { version = "1.1.3", optional = true }
 
 [lints]

crates/dictgen/Cargo.toml

@@ -20,7 +20,7 @@ dictgen = { version = "^0.4", path = "../dictgen" }
 codegenrs = "3.0"
 regex = "1"
 dictgen = { version = "^0.4", path = "../dictgen", features = ["codegen"] }
-snapbox = "0.6.5"
+snapbox = "0.6.21"
 
 [lints]
 workspace = true

crates/misspell-dict/Cargo.toml

@@ -47,14 +47,14 @@ typos-dict = { version = "^0.13", path = "../typos-dict", optional = true }
 typos-vars = { version = "^0.10", path = "../typos-vars", optional = true }
 unicase = "2.8.1"
 anyhow = "1.0"
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.48", features = ["derive"] }
 clap-verbosity-flag = "3.0"
 ignore = "0.4"
 serde = { version = "1.0", features = ["derive"] }
-toml = "0.9.1"
+toml = "0.9.7"
 log = "0.4"
 env_logger = { version = "0.11", default-features = false, features = ["auto-color"] }
-bstr = "1.9"
+bstr = "1.12"
 ahash = "0.8"
 difflib = "0.4"
 proc-exit = "2.0"
@@ -64,27 +64,27 @@ derive_more = { version = "2.0", features = ["from", "display"] }
 derive_setters = "0.1"
 itertools = "0.14"
 serde_json = "1.0"
-kstring = { version = "2.0.0", features = ["serde"] }
+kstring = { version = "2.0.2", features = ["serde"] }
 typed-arena = "2.0.2"
-thread_local = "1.1.8"
-globset = "0.4.14"
-anstyle = "1.0.6"
-anstream = "0.6.13"
-colorchoice-clap = "1.0.3"
+thread_local = "1.1.9"
+globset = "0.4.16"
+anstyle = "1.0.13"
+anstream = "0.6.20"
+colorchoice-clap = "1.0.7"
 serde_regex = "1.1.0"
-regex = "1.10.4"
-encoding_rs = "0.8.34"
-serde-sarif = "0.7.0"
-schemars = { version = "0.9.0", features = ["preserve_order","semver1"], optional = true }
-annotate-snippets = "0.12.2"
+regex = "1.11.3"
+encoding_rs = "0.8.35"
+serde-sarif = "0.8.0"
+schemars = { version = "1.0.4", features = ["preserve_order","semver1"], optional = true }
+annotate-snippets = "0.12.4"
 terminal_size = "0.4.3"
 supports-unicode = "3.0.0"
 
 [dev-dependencies]
 assert_fs = "1.1"
-divan = "0.1.14"
+divan = "0.1.21"
 maplit = "1.0"
-snapbox = "0.6.5"
+snapbox = "0.6.21"
 trycmd = "0.15.10"
 
 [[bench]]

crates/typos-cli/Cargo.toml

@@ -369,7 +369,7 @@ fn typo_to_sarif_result(
     fix: Option<Fix>,
 ) -> Result<sarif::Result, Box<dyn std::error::Error>> {
     let mut result = sarif::Result::builder()
-        .level(sarif::ResultLevel::Error.to_string())
+        .level(sarif::ResultLevel::Error)
         .message(sarif::Message::builder().markdown(message).build())
         .locations(vec![location])
         .build();

crates/typos-cli/src/bin/typos-cli/report.rs

@@ -193,7 +193,7 @@ impl<'s> ConfigEngine<'s> {
         for (type_name, type_engine) in type_.patterns() {
             if type_engine.extend_glob.is_empty() {
                 if !type_matcher.contains_name(&type_name) {
-                    anyhow::bail!("Unknown type definition `{}`, pass `--type-list` to see valid names or set `extend-glob` to add a new one.", type_name);
+                    anyhow::bail!("Unknown type definition `{type_name}`, pass `--type-list` to see valid names or set `extend-glob` to add a new one.");
                 }
             } else {
                 for glob in type_engine.extend_glob.iter() {

crates/typos-cli/src/policy.rs

@@ -16,7 +16,7 @@ all-features = true
 rustdoc-args = ["--generate-link-to-definition"]
 
 [dependencies]
-phf = "0.12.0"
+phf = "0.13.1"
 dictgen = { version = "^0.4", path = "../dictgen", features = ["map"] }
 
 [dev-dependencies]
@@ -27,9 +27,9 @@ unicase = "2.8.1"
 codegenrs = "3.0"
 dictgen = { version = "^0.4", path = "../dictgen", features = ["codegen", "map", "aho-corasick"] }
 varcon = { version = "^1.0", path = "../varcon" }
-snapbox = "0.6.5"
-indexmap = "2.2.6"
-divan = "0.1.16"
+snapbox = "0.6.21"
+indexmap = "2.11.4"
+divan = "0.1.21"
 heck = "0.5.0"
 
 [lints]

crates/typos-dict/Cargo.toml

@@ -26,7 +26,7 @@ typos = { version = "^0.10", path = "../typos" }
 codegenrs = "3.0"
 itertools = "0.14"
 dictgen = { version = "^0.4", path = "../dictgen", features = ["codegen"] }
-snapbox = "0.6.5"
+snapbox = "0.6.21"
 
 [lints]
 workspace = true