Skip to content

Optimize Iterator for IIterator<T> #3476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennykerr merged 2 commits into from
Feb 7, 2025
Merged

Optimize Iterator for IIterator<T> #3476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dc15c8
HasCurrent
kennykerr Feb 6, 2025
5766ed4
tests
kennykerr Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion crates/libs/bindgen/src/types/interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
Comment on lines +464 to +468
Copy link
Copy Markdown
Collaborator Author

@kennykerr kennykerr Feb 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only change - the rest are the output of code generation used for validation.


if result.is_some() {
self.MoveNext().ok()?;
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/windows/src/Windows/Foundation/Collections/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()?;
}
Expand Down
6 changes: 5 additions & 1 deletion crates/tests/bindgen/src/class_dep.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()?;
}
Expand Down
6 changes: 5 additions & 1 deletion crates/tests/bindgen/src/interface_iterable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()?;
}
Expand Down