More efficient DevicePath parsing

RReverser · Aug 30, 2024 · 8dede6c · 8dede6c
1 parent 0b6c067
commit 8dede6c
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/macros.rs b/src/macros.rs
@@ -335,16 +335,17 @@ macro_rules! rpc_mod {
 
         impl<'de> Deserialize<'de> for DevicePath {
             fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-                Ok(DevicePath(match String::deserialize(deserializer)?.as_str() {
+                #[derive(Deserialize)]
+                #[serde(remote = "DeviceType")]
+                enum DevicePathRepr {
                     $(
                         #[cfg(feature = $path)]
-                        $path => DeviceType::$trait_name,
+                        #[serde(rename = $path)]
+                        $trait_name,
                     )*
-                    other => return Err(serde::de::Error::unknown_variant(other, &[ $(
-                        #[cfg(feature = $path)]
-                        $path
-                    ),* ])),
-                }))
+                }
+
+                DevicePathRepr::deserialize(deserializer).map(Self)
             }
         }