Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix toml

Browse Source
This commit is contained in:
Aiden McClelland
2021-07-02 11:06:09 -06:00
committed by Aiden McClelland
parent 0739690dcb
commit 9494fc9b60
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
appmgr/src/util.rs
View File

@@ -674,13 +674,22 @@ impl IoFormat {
serde_cbor::to_writer(writer, value).with_kind(crate::ErrorKind::Serialization)
}
IoFormat::Toml => writer
.write_all(&serde_toml::to_vec(value).with_kind(crate::ErrorKind::Serialization)?)
.write_all(
&serde_toml::to_vec(
&serde_toml::Value::try_from(value)
.with_kind(crate::ErrorKind::Serialization)?,
)
.with_kind(crate::ErrorKind::Serialization)?,
)
.with_kind(crate::ErrorKind::Serialization),
IoFormat::TomlPretty => writer
.write_all(
serde_toml::to_string_pretty(value)
.with_kind(crate::ErrorKind::Serialization)?
.as_bytes(),
serde_toml::to_string_pretty(
&serde_toml::Value::try_from(value)
.with_kind(crate::ErrorKind::Serialization)?,
)
.with_kind(crate::ErrorKind::Serialization)?
.as_bytes(),
)
.with_kind(crate::ErrorKind::Serialization),
}
@@ -693,10 +702,15 @@ impl IoFormat {
}
IoFormat::Yaml => serde_yaml::to_vec(value).with_kind(crate::ErrorKind::Serialization),
IoFormat::Cbor => serde_cbor::to_vec(value).with_kind(crate::ErrorKind::Serialization),
IoFormat::Toml => serde_toml::to_vec(value).with_kind(crate::ErrorKind::Serialization),
IoFormat::TomlPretty => serde_toml::to_string_pretty(value)
.map(|s| s.into_bytes())
.with_kind(crate::ErrorKind::Serialization),
IoFormat::Toml => serde_toml::to_vec(
&serde_toml::Value::try_from(value).with_kind(crate::ErrorKind::Serialization)?,
)
.with_kind(crate::ErrorKind::Serialization),
IoFormat::TomlPretty => serde_toml::to_string_pretty(
&serde_toml::Value::try_from(value).with_kind(crate::ErrorKind::Serialization)?,
)
.map(|s| s.into_bytes())
.with_kind(crate::ErrorKind::Serialization),
}
}
/// BLOCKING