Skip to content

Commit e683310

Browse files
committed
Update json_value_merge to 2.0.0
1 parent 260bcf5 commit e683310

3 files changed

Lines changed: 8 additions & 11 deletions

File tree

Cargo.lock

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

crates/taplo-common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ globset = "0.4.8"
2020
hex = "0.4.3"
2121
indexmap = { version = "1.6.0", features = ["serde", "rayon"] }
2222
itertools = "0.10.3"
23-
json_value_merge = "1.1.2"
23+
json_value_merge = "2.0.0"
2424
jsonschema = { version = "0.17.1", default-features = false }
2525
lru = "0.7.2"
2626
parking_lot = "0.12.0"

crates/taplo-common/src/schema/mod.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -550,16 +550,13 @@ impl<E: Environment> Schemas<E> {
550550
let mut merged_all_of = Value::Object(serde_json::Map::default());
551551

552552
for all_of in all_ofs {
553-
merged_all_of.merge(
554-
if let Some(schema) = self.ref_schema_value(root_url, all_of).await {
555-
Arc::try_unwrap(schema).unwrap()
556-
} else {
557-
all_of.clone()
558-
},
559-
);
553+
merged_all_of.merge(match self.ref_schema_value(root_url, all_of).await {
554+
Some(ref schema) => schema,
555+
None => all_of,
556+
});
560557
}
561558

562-
merged_all_of.merge(schema);
559+
merged_all_of.merge(&schema);
563560

564561
self.collect_child_schemas(
565562
root_url,

0 commit comments

Comments
 (0)