defmt-decoder: impl FromStr for Encoding

decoder/src/elf2table/mod.rs

@@ -13,7 +13,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use crate::{BitflagsKey, Encoding, StringEntry, Table, TableEntry, Tag, DEFMT_VERSION};
+use crate::{BitflagsKey, StringEntry, Table, TableEntry, Tag, DEFMT_VERSION};
 use anyhow::{anyhow, bail, ensure};
 use object::{Object, ObjectSection, ObjectSymbol};
 
@@ -99,11 +99,7 @@ pub fn parse_impl(elf: &[u8], check_version: bool) -> Result<Option<Table>, anyh
     }
 
     let encoding = match encoding {
-        Some(e) => match &e[..] {
-            "raw" => Encoding::Raw,
-            "rzcobs" => Encoding::Rzcobs,
-            _ => bail!("Unknown defmt encoding '{}' specified. This is a bug.", e),
-        },
+        Some(e) => e.parse()?,
         None => bail!("No defmt encoding specified. This is a bug."),
     };
 

decoder/src/lib.rs

@@ -22,6 +22,7 @@ use std::{
     collections::{BTreeMap, HashMap},
     error::Error,
     fmt, io,
+    str::FromStr,
 };
 
 use byteorder::{ReadBytesExt, LE};
@@ -121,6 +122,18 @@ enum Encoding {
     Rzcobs,
 }
 
+impl FromStr for Encoding {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "raw" => Ok(Encoding::Raw),
+            "rzcobs" => Ok(Encoding::Rzcobs),
+            _ => anyhow::bail!("Unknown defmt encoding '{}' specified. This is a bug.", s),
+        }
+    }
+}
+
 /// Internal table that holds log levels and maps format strings to indices
 #[derive(Debug, PartialEq)]
 pub struct Table {