tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

caution: don't crash on unknown keyword

Browse Source 
Fixes: 34f0c3b0ce ("serialization for DecksCache")
This commit is contained in:
William Casarin
2024-12-10 15:11:27 -08:00
parent 06c9023e30
commit d36487e28f
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/storage/decks.rs
View File

@@ -174,13 +174,15 @@ impl MetadataKeyword {
} }
impl fmt::Display for MetadataKeyword { impl fmt::Display for MetadataKeyword {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let name = MetadataKeyword::MAPPING if let Some(name) = MetadataKeyword::MAPPING
.iter() .iter()
.find(|(_, keyword)| keyword == self) .find(|(_, keyword)| keyword == self)
.map(|(name, _)| *name) .map(|(name, _)| *name)
.expect("MAPPING is incorrect"); {
write!(f, "{}", name)
write!(f, "{}", name) } else {
write!(f, "UnknownMetadataKeyword")
}
} }
} }
@@ -407,13 +409,15 @@ impl Keyword {
impl fmt::Display for Keyword { impl fmt::Display for Keyword {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let name = Keyword::MAPPING if let Some(name) = Keyword::MAPPING
.iter() .iter()
.find(|(_, keyword, _)| keyword == self) .find(|(_, keyword, _)| keyword == self)
.map(|(name, _, _)| *name) .map(|(name, _, _)| *name)
.expect("MAPPING is incorrect"); {
write!(f, "{}", name)
write!(f, "{}", name) } else {
write!(f, "UnknownKeyword")
}
} }
} }