Skip to content
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

Jump to bottom

Add Drop impl for linked_list::DrainFilter #46581

Merged
merged 3 commits into from
Dec 9, 2017
Merged

Add Drop impl for linked_list::DrainFilter #46581

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37335d3
Add Drop impl for linked_list::DrainFilter
tmccombs Dec 8, 2017
00acdbd
Make drop impl stable for DrainFilter
tmccombs Dec 8, 2017
cdf1d7d
Revert "Make drop impl stable for DrainFilter"
tmccombs Dec 9, 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
9 changes: 9 additions & 0 deletions src/liballoc/linked_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,15 @@ impl<'a, T, F> Iterator for DrainFilter<'a, T, F>
}
}

#[stable(feature = "drain_filter_drop", since = "1.25.0")]
Copy link
Member

Choose a reason for hiding this comment

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

@sfackler While trait impls are insta-stable, the type it is implemented for is still unstable, so we can still keep this #[unstable] (see the Debug impl below).

Furthermore, 1.25 doesn't branch off until January, so even if we keep this #[stable] the version should still be 1.24.

Copy link
Member

Choose a reason for hiding this comment

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

Ah right, thanks for the correction! Sorry about that, @tmccombs - can you switch it back to unstable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

haha sure

impl<'a, T, F> Drop for DrainFilter<'a, T, F>
where F: FnMut(&mut T) -> bool,
{
fn drop(&mut self) {
for _ in self { }
}
}

#[unstable(feature = "drain_filter", reason = "recently added", issue = "43244")]
impl<'a, T: 'a + fmt::Debug, F> fmt::Debug for DrainFilter<'a, T, F>
where F: FnMut(&mut T) -> bool
Expand Down