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
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ resolver = "2"

[workspace.dependencies]
"dbt-yaml" = { path = "dbt-yaml" }
"dbt-yaml_derive" = { version = "0.9.4", path = "dbt-yaml_derive" }
"dbt-yaml_schemars_derive" = { version = "0.9.4", path = "dbt-yaml_schemars_derive" }
"dbt-yaml_derive" = { version = "0.9.5", path = "dbt-yaml_derive" }
"dbt-yaml_schemars_derive" = { version = "0.9.5", path = "dbt-yaml_schemars_derive" }
2 changes: 1 addition & 1 deletion dbt-yaml/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dbt-yaml"
version = "0.9.4"
version = "0.9.5"
authors = ["Bo Lin <bo.lin@dbtlabs.com>", "David Tolnay <dtolnay@gmail.com>"]
categories = ["encoding", "parser-implementations"]
description = "YAML data format for Serde"
Expand Down
4 changes: 3 additions & 1 deletion dbt-yaml/src/value/de/borrowed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,9 @@ impl<'de, 'u, 'f> Deserializer<'de> for ValueRefDeserializer<'de, '_, 'u, 'f> {
self.value.broadcast_end_mark();
maybe_why_not!(
self.value,
visitor.visit_unit().map_err(|e| error::set_span(e, span, path))
visitor
.visit_unit()
.map_err(|e| error::set_span(e, span, path))
)
}
}
Expand Down
5 changes: 3 additions & 2 deletions dbt-yaml/src/value/de/owned.rs
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,9 @@ impl<'de, 'u, 'f> Deserializer<'de> for ValueDeserializer<'_, 'u, 'f> {
let path = self.path;
self.value.broadcast_end_mark();
drop(self);
visitor.visit_unit().map_err(|e| error::set_span(e, span, path))
visitor
.visit_unit()
.map_err(|e| error::set_span(e, span, path))
}
}

Expand Down Expand Up @@ -1603,4 +1605,3 @@ impl<'de, 'r, 'f> Deserializer<'de> for FlattenDeserializer<'_, 'r, 'f> {
map enum identifier
}
}

3 changes: 2 additions & 1 deletion dbt-yaml/tests/test_error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ fn test_duplicate_scalar_anchor() {
second: &dup scalar_b
result: *dup
"};
let expected = "found duplicate anchor (first occurrence at line 1 column 8) at line 2 column 9";
let expected =
"found duplicate anchor (first occurrence at line 1 column 8) at line 2 column 9";
test_error::<Value>(yaml, expected);
}

Expand Down
3 changes: 2 additions & 1 deletion dbt-yaml/tests/test_spanned.rs
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,8 @@ fn test_transform_spanned() {
#[cfg(feature = "filename")]
{
let spanned_point: Spanned<Point> = dbt_yaml::from_str(yaml).unwrap();
let transformed = spanned_point.map_span(|span| span.with_filename(std::path::PathBuf::from("newfile.yml")));
let transformed = spanned_point
.map_span(|span| span.with_filename(std::path::PathBuf::from("newfile.yml")));
assert_eq!(*transformed, Point { x: 1.0, y: 2.0 });
assert_eq!(
transformed.span().filename.as_deref(),
Expand Down
2 changes: 1 addition & 1 deletion dbt-yaml_derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2024"
name = "dbt-yaml_derive"
version = "0.9.4"
version = "0.9.5"
description = "Derive macros for dbt-yaml"
authors = ["Bo Lin <bo.lin@dbtlabs.com>"]
license = "MIT OR Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion dbt-yaml_schemars_derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT"
name = "dbt-yaml_schemars_derive"
repository = "https://github.com/sdf-labs/dbt-yaml"
rust-version = "1.88"
version = "0.9.4"
version = "0.9.5"

[lib]
proc-macro = true
Expand Down
Loading