Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
830 changes: 385 additions & 445 deletions Cargo.lock

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
"title": "Config",
"type": "object",
"properties": {
"type": {
"type": "object",
"additionalProperties": {
"$ref": "#/$defs/GlobEngineConfig"
},
"default": {}
},
"files": {
"$ref": "#/$defs/Walk",
"default": {
Expand Down Expand Up @@ -38,6 +31,10 @@
"extend-words": {},
"extend-ignore-re": []
}
},
"type": {
"$ref": "#/$defs/TypeEngineConfig",
"default": {}
}
},
"additionalProperties": false,
Expand Down Expand Up @@ -212,6 +209,12 @@
"en-au"
]
},
"TypeEngineConfig": {
"type": "object",
"additionalProperties": {
"$ref": "#/$defs/GlobEngineConfig"
}
},
"GlobEngineConfig": {
"type": "object",
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion crates/codespell-dict/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions crates/dictgen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion crates/misspell-dict/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
32 changes: 16 additions & 16 deletions crates/typos-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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]]
Expand Down
2 changes: 1 addition & 1 deletion crates/typos-cli/src/bin/typos-cli/report.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion crates/typos-cli/src/policy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions crates/typos-dict/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion crates/typos-vars/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions crates/typos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ all-features = true
rustdoc-args = ["--generate-link-to-definition"]

[dependencies]
winnow = "0.7.0"
unicode-xid = "0.2.4"
winnow = "0.7.13"
unicode-xid = "0.2.6"
serde = { version = "1.0", features = ["derive"] }
simdutf8 = "0.1.4"
simdutf8 = "0.1.5"
itertools = "0.14"
bstr = "1.9"
bstr = "1.12"

[lints]
workspace = true

[dev-dependencies]
snapbox = "0.6.11"
snapbox = "0.6.21"
4 changes: 2 additions & 2 deletions crates/varcon-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ parser = ["dep:winnow"]
flags = ["dep:enumflags2"]

[dependencies]
winnow = { version = "0.7.0", optional = true }
winnow = { version = "0.7.13", optional = true }
enumflags2 = { version = "0.7", optional = true }

[lints]
workspace = true

[dev-dependencies]
snapbox = "0.6.17"
snapbox = "0.6.21"
2 changes: 1 addition & 1 deletion crates/varcon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ varcon-core = { version = "^5.0", path = "../varcon-core" }
[dev-dependencies]
codegenrs = "3.0"
varcon-core = { version = "^5.0", path = "../varcon-core", features = ["parser"] }
snapbox = "0.6.5"
snapbox = "0.6.21"

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/wikipedia-dict/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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"

[lints]
workspace = true
Loading