Simplify entry id identification

m4b · Dec 11, 2024 · 9af1f1d · 9af1f1d
1 parent 2d7749a
commit 9af1f1d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/pe/resource.rs b/src/pe/resource.rs
@@ -1148,10 +1148,10 @@ impl<'a> VersionInfo<'a> {
         file_alignment: u32,
         opts: &options::ParseOptions,
     ) -> error::Result<Option<Self>> {
-        let it = it.collect::<Result<Vec<_>, _>>()?;
-        let it = it.iter().find(|e| e.id() == Some(RT_VERSION));
-
-        if let Some(entry) = it {
+        if let Some(entry) = it
+            .filter_map(|x| x.ok())
+            .find(|x| x.id() == Some(RT_VERSION))
+        {
             let offset_to_data =
                 match entry.recursive_next_depth(bytes, |e| e.offset_to_data().is_none())? {
                     Some(next) => match next.offset_to_data() {
@@ -1226,10 +1226,10 @@ impl<'a> ManifestData<'a> {
         file_alignment: u32,
         opts: &options::ParseOptions,
     ) -> error::Result<Option<Self>> {
-        let it = it.collect::<Result<Vec<_>, _>>()?;
-        let it = it.iter().find(|e| e.id() == Some(RT_MANIFEST));
-
-        if let Some(entry) = it {
+        if let Some(entry) = it
+            .filter_map(|x| x.ok())
+            .find(|x| x.id() == Some(RT_VERSION))
+        {
             let offset_to_data =
                 match entry.recursive_next_depth(bytes, |e| e.offset_to_data().is_none())? {
                     Some(next) => match next.offset_to_data() {