Optimize Iterator for IIterator<T> (#3476)

microsoft · Feb 7, 2025 · 35c31ad · 35c31ad
1 parent 1a3f15b
commit 35c31ad
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/crates/libs/bindgen/src/types/interface.rs b/crates/libs/bindgen/src/types/interface.rs
@@ -461,7 +461,11 @@ impl Interface {
                         type Item = T;
 
                         fn next(&mut self) -> Option<Self::Item> {
-                            let result = self.Current().ok();
+                            let result = if self.HasCurrent().unwrap_or(false) {
+                                self.Current().ok()
+                            } else {
+                                None
+                            };
 
                             if result.is_some() {
                                 self.MoveNext().ok()?;

diff --git a/crates/libs/windows/src/Windows/Foundation/Collections/mod.rs b/crates/libs/windows/src/Windows/Foundation/Collections/mod.rs
@@ -228,7 +228,7 @@ where
 impl<T: windows_core::RuntimeType> Iterator for IIterator<T> {
     type Item = T;
     fn next(&mut self) -> Option<Self::Item> {
-        let result = self.Current().ok();
+        let result = if self.HasCurrent().unwrap_or(false) { self.Current().ok() } else { None };
         if result.is_some() {
             self.MoveNext().ok()?;
         }

diff --git a/crates/tests/bindgen/src/class_dep.rs b/crates/tests/bindgen/src/class_dep.rs
@@ -332,7 +332,11 @@ where
 impl<T: windows_core::RuntimeType> Iterator for IIterator<T> {
     type Item = T;
     fn next(&mut self) -> Option<Self::Item> {
-        let result = self.Current().ok();
+        let result = if self.HasCurrent().unwrap_or(false) {
+            self.Current().ok()
+        } else {
+            None
+        };
         if result.is_some() {
             self.MoveNext().ok()?;
         }

diff --git a/crates/tests/bindgen/src/interface_iterable.rs b/crates/tests/bindgen/src/interface_iterable.rs
@@ -332,7 +332,11 @@ where
 impl<T: windows_core::RuntimeType> Iterator for IIterator<T> {
     type Item = T;
     fn next(&mut self) -> Option<Self::Item> {
-        let result = self.Current().ok();
+        let result = if self.HasCurrent().unwrap_or(false) {
+            self.Current().ok()
+        } else {
+            None
+        };
         if result.is_some() {
             self.MoveNext().ok()?;
         }