-
Notifications
You must be signed in to change notification settings - Fork 287
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.
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
Wean HashSet
from the raw-entry API
#555
Conversation
57f60db
to
dd26cdb
Compare
@bors r+ |
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
☔ The latest upstream changes (presumably #554) made this pull request unmergeable. Please resolve the merge conflicts. |
This changes `get_or_insert`, `get_or_insert_with`, and `bitxor_assign` to poke directly at the `RawTable` instead of using `raw_entry_mut()`. `HashSet::get_or_insert_with` also asserts that the converted value is actually equivalent after conversion, so we can ensure set consistency. `HashSet::get_or_insert_owned` is removed for now, since it offers no value over the `_with` method, as we would need to assert that too.
Co-authored-by: JustForFun88 <[email protected]>
dd26cdb
to
6420cfd
Compare
The conflict was simply in the placement of new tests. @bors r=Amanieu |
Wean `HashSet` from the raw-entry API This changes `get_or_insert`, `get_or_insert_with`, and `bitxor_assign` to poke directly at the `RawTable` instead of using `raw_entry_mut()`. `HashSet::get_or_insert_with` also asserts that the converted value is actually equivalent after conversion, so we can ensure set consistency. `HashSet::get_or_insert_owned` is removed for now, since it offers no value over the `_with` method, as we would need to assert that too.
💥 Test timed out |
@bors retry |
☀️ Test successful - checks-actions |
This changes
get_or_insert
,get_or_insert_with
, andbitxor_assign
to poke directly at the
RawTable
instead of usingraw_entry_mut()
.HashSet::get_or_insert_with
also asserts that the converted value isactually equivalent after conversion, so we can ensure set consistency.
HashSet::get_or_insert_owned
is removed for now, since it offers novalue over the
_with
method, as we would need to assert that too.