Fix toml value ser after update of toml dependency

Update in v0.8.5 required changes to serialization code;
toml::to_string() now serializes TOML documents, not values.

This commit replaces all occurances with toml::Value serializations.

Fixes: 8fff7401 ("Update yanked zerocopy dependency")
Closes: #429
Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
pull/430/head
Manos Pitsidianakis 4 months ago
parent 5110813e87
commit 8dc4465c58
No known key found for this signature in database
GPG Key ID: 7729C7707F7E09D0

@ -1061,7 +1061,9 @@ mod dotaddressable {
std::any::type_name::<Self>() std::any::type_name::<Self>()
))) )))
} else { } else {
Ok(toml::to_string(self).map_err(|err| err.to_string())?) Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string())
} }
} }
} }
@ -1112,7 +1114,9 @@ mod dotaddressable {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }
@ -1140,7 +1144,9 @@ mod dotaddressable {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }
@ -1161,7 +1167,9 @@ mod dotaddressable {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }
@ -1196,7 +1204,9 @@ mod dotaddressable {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }
@ -1215,7 +1225,9 @@ mod dotaddressable {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }
@ -1245,7 +1257,9 @@ mod dotaddressable {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }
@ -1272,7 +1286,9 @@ mod dotaddressable {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }
@ -1295,7 +1311,9 @@ mod dotaddressable {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }

@ -252,7 +252,9 @@ impl DotAddressable for ListingSettings {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }

@ -88,7 +88,9 @@ impl DotAddressable for NotificationsSettings {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }

@ -176,7 +176,9 @@ impl DotAddressable for PagerSettings {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }

@ -83,7 +83,9 @@ impl DotAddressable for Shortcuts {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }
@ -148,7 +150,7 @@ macro_rules! shortcut_key_values {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self).map_err(|err| err.to_string())?.to_string()),
} }
} }
} }

@ -93,7 +93,9 @@ impl DotAddressable for TagsSettings {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }

@ -113,7 +113,9 @@ impl DotAddressable for TerminalSettings {
))), ))),
} }
} }
None => Ok(toml::to_string(self).map_err(|err| err.to_string())?), None => Ok(toml::Value::try_from(self)
.map_err(|err| err.to_string())?
.to_string()),
} }
} }
} }

@ -1250,9 +1250,12 @@ impl Themes {
ret, ret,
"\"{}\" = {{ fg = {}, bg = {}, attrs = {} }}", "\"{}\" = {{ fg = {}, bg = {}, attrs = {} }}",
k, k,
toml::to_string(&unlink_fg(theme, &ColorField::Fg, k)).unwrap(), toml::Value::try_from(unlink_fg(theme, &ColorField::Fg, k))
toml::to_string(&unlink_bg(theme, &ColorField::Bg, k)).unwrap(), .expect("Could not serialize Color"),
toml::to_string(&unlink_attrs(theme, k)).unwrap(), toml::Value::try_from(unlink_bg(theme, &ColorField::Bg, k))
.expect("Could not serialize Color"),
toml::Value::try_from(unlink_attrs(theme, k))
.expect("Could not serialize Attribute"),
); );
} }
} else { } else {
@ -1261,9 +1264,9 @@ impl Themes {
ret, ret,
"\"{}\" = {{ fg = {}, bg = {}, attrs = {} }}", "\"{}\" = {{ fg = {}, bg = {}, attrs = {} }}",
k, k,
toml::to_string(&theme[k].fg).unwrap(), toml::Value::try_from(&theme[k].fg).expect("Could not serialize Color"),
toml::to_string(&theme[k].bg).unwrap(), toml::Value::try_from(&theme[k].bg).expect("Could not serialize Color"),
toml::to_string(&theme[k].attrs).unwrap(), toml::Value::try_from(&theme[k].attrs).expect("Could not serialize Attribute")
); );
} }
} }

Loading…
Cancel
Save