zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-23 18:29:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update serde_yaml crate

Browse Source
This commit is contained in:
Jeremy Wall 2023-01-16 14:58:31 -05:00
parent e1600b0ebe
commit c59d25974a
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Cargo.lock generated
View File

@ -246,12 +246,6 @@ version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
name = "linked-hash-map"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.1.4" version = "0.1.4"
@ -436,14 +430,15 @@ dependencies = [
[[package]] [[package]]
name = "serde_yaml" name = "serde_yaml"
version = "0.8.26" version = "0.9.16"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" checksum = "92b5b431e8907b50339b51223b97d102db8d987ced36f6e4d03621db9316c834"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"itoa",
"ryu", "ryu",
"serde", "serde",
"yaml-rust", "unsafe-libyaml",
] ]
[[package]] [[package]]
@ -564,6 +559,12 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "unsafe-libyaml"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2"
[[package]] [[package]]
name = "utf8parse" name = "utf8parse"
version = "0.2.0" version = "0.2.0"
@ -686,12 +687,3 @@ name = "xml-rs"
version = "0.8.4" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
[[package]]
name = "yaml-rust"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
dependencies = [
"linked-hash-map",
]

2
Cargo.toml
View File

@ -23,7 +23,7 @@ abortable_parser = "=0.2.3"
clap = "~2.33.0" clap = "~2.33.0"
serde_json = "~1.0.9" serde_json = "~1.0.9"
simple-error = "0.2.0" simple-error = "0.2.0"
serde_yaml = "0.8.17" serde_yaml = "0.9.16"
toml = "~0.5.8" toml = "~0.5.8"
xml-rs = "0.8.0" xml-rs = "0.8.0"
base64 = "0.21.0" base64 = "0.21.0"

12
src/convert/yaml.rs
View File

@ -77,8 +77,10 @@ impl YamlConverter {
serde_yaml::Value::Null => "null".to_string(), serde_yaml::Value::Null => "null".to_string(),
serde_yaml::Value::Number(n) => n.to_string(), serde_yaml::Value::Number(n) => n.to_string(),
serde_yaml::Value::String(s) => s.clone(), serde_yaml::Value::String(s) => s.clone(),
serde_yaml::Value::Sequence(_) | serde_yaml::Value::Mapping(_) => { serde_yaml::Value::Sequence(_)
eprintln!("Unsupported key type in yaml import skipping"); | serde_yaml::Value::Mapping(_)
| serde_yaml::Value::Tagged(_) => {
eprintln!("Unsupported key type in yaml map key import skipping");
continue; continue;
} }
}; };
@ -127,6 +129,12 @@ impl YamlConverter {
collapsed.reverse(); collapsed.reverse();
Val::Tuple(collapsed) Val::Tuple(collapsed)
} }
serde_yaml::Value::Tagged(_) => {
eprintln!(
"Tagged value types are not supported in yaml imports. Replacing with Empty..."
);
Val::Empty
}
}) })
} }