djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AnyMap: print deserialization errors to stderr

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-10-02 21:30:52 +02:00
parent f59abd9684
commit 1537171205
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
egui/src/any/serializable/element.rs
View file

@ -120,7 +120,7 @@ impl AnyMapElement {
match self { match self {
AnyMapElement(Deserialized { value, .. }) => value.downcast_mut(), AnyMapElement(Deserialized { value, .. }) => value.downcast_mut(),
AnyMapElement(Serialized(s, _)) => { AnyMapElement(Serialized(s, _)) => {
*self = Self::new(ron::from_str::<T>(s).ok()?); *self = Self::new(from_ron_str::<T>(s)?);
match self { match self {
AnyMapElement(Deserialized { value, .. }) => value.downcast_mut(), AnyMapElement(Deserialized { value, .. }) => value.downcast_mut(),
@ -138,12 +138,14 @@ impl AnyMapElement {
Deserialized { value, .. } => { Deserialized { value, .. } => {
if !value.is::<T>() { if !value.is::<T>() {
*self = Self::new(set_with()); *self = Self::new(set_with());
// TODO: log this error, because it can occurs when user used same Id or same type for different widgets eprintln!(
"egui: Value stored in serialized memory was not of type {}",
std::any::type_name::<T>()
);
} }
} }
Serialized(s, _) => { Serialized(s, _) => {
*self = Self::new(ron::from_str::<T>(s).unwrap_or_else(|_| set_with())); *self = Self::new(from_ron_str::<T>(s).unwrap_or_else(|| set_with()));
// TODO: log deserialization error
} }
} }
@ -153,3 +155,18 @@ impl AnyMapElement {
} }
} }
} }
fn from_ron_str<T: serde::de::DeserializeOwned>(ron: &str) -> Option<T> {
match ron::from_str::<T>(ron) {
Ok(value) => Some(value),
Err(err) => {
eprintln!(
"egui: Failed to deserialize {} from memory: {}, ron: {:?}",
std::any::type_name::<T>(),
err,
ron
);
None
}
}
}