Skip to content

Commit b070282

Browse files
authored
Replace serde-yaml with serde-saphyr (again) (#1520)
serde-saphyr has way better error message, and it is written in safe Rust. Previous try: #1087 Previous revert: #1106 and #1112 TODO: Replace serialize_yaml_scalar with serde-saphyr as well: https://github.com/j178/prek/blob/0a4be22599076b8c6273940b2760828b442c78f4/crates/prek/src/yaml.rs#L12-L13
1 parent 2a44762 commit b070282

File tree

15 files changed

+1042
-1191
lines changed

15 files changed

+1042
-1191
lines changed

Cargo.lock

Lines changed: 86 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ semver = { version = "1.0.24", features = ["serde"] }
7575
serde = { version = "1.0.210", features = ["derive"] }
7676
serde_json = { version = "1.0.132", features = ["unbounded_depth"] }
7777
serde_stacker = { version = "0.1.12" }
78-
serde_yaml = { version = "0.9.34" }
78+
serde-saphyr = { version = "0.0.17", default-features = false }
7979
shlex = { version = "1.3.0" }
8080
globset = { version = "0.4.18" }
8181
smallvec = { version = "1.15.1" }
@@ -136,6 +136,7 @@ similar_names = "allow"
136136
too_many_arguments = "allow"
137137
too_many_lines = "allow"
138138
used_underscore_binding = "allow"
139+
items_after_statements = "allow"
139140
# Disallowed restriction lints
140141
print_stdout = "warn"
141142
print_stderr = "warn"

crates/prek/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ semver = { workspace = true, features = ["serde"] }
7777
serde = { workspace = true, features = ["derive"] }
7878
serde_json = { workspace = true, features = ["unbounded_depth"] }
7979
serde_stacker = { workspace = true }
80-
serde_yaml = { workspace = true }
80+
serde-saphyr = { workspace = true, default-features = false }
8181
shlex = { workspace = true }
8282
smallvec = { workspace = true }
8383
target-lexicon = { workspace = true }

crates/prek/src/cli/run/filter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,10 +381,10 @@ async fn collect_files_from_args(
381381
#[cfg(test)]
382382
mod tests {
383383
use super::*;
384+
use crate::config::GlobPatterns;
384385

385386
fn glob_pattern(pattern: &str) -> FilePattern {
386-
serde_yaml::from_str::<FilePattern>(&format!("glob: {pattern}"))
387-
.expect("glob pattern should deserialize")
387+
FilePattern::Glob(GlobPatterns::new(vec![pattern.to_string()]).unwrap())
388388
}
389389

390390
#[test]

0 commit comments

Comments
 (0)