Skip to content

Optimize drain_filter #44355

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
merged 4 commits into from
Sep 20, 2017
Merged

Optimize drain_filter #44355

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e2427c
Remove unneeded copy
Xaeroxe Sep 5, 2017
4817754
Fix ownership issues
Xaeroxe Sep 5, 2017
4de0cf1
Try using ref to raw conversion
Xaeroxe Sep 6, 2017
10384ab
Add requested comment
Xaeroxe Sep 18, 2017
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
8 changes: 7 additions & 1 deletion src/liballoc/vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2691,7 +2691,13 @@ impl<'a, T, F> Iterator for DrainFilter<'a, T, F>
self.del += 1;
return Some(ptr::read(&v[i]));
} else if self.del > 0 {
v.swap(i - self.del, i);
let del = self.del;
let src: *const T = &v[i];
let dst: *mut T = &mut v[i - del];
// This is safe because self.vec has length 0
// thus its elements will not have Drop::drop
// called on them in the event of a panic.
ptr::copy_nonoverlapping(src, dst, 1);
}
}
None
Expand Down