Rework the Entry API #535
Merged
Rework the Entry API #535
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
☔ The latest upstream changes (presumably #534) made this pull request unmergeable. Please resolve the merge conflicts. |
The main change in this PR is that `OccupiedEntry` no longer holds the
key used in the initial `entry` call. As a result, `OccupiedEntryRef` is
no longer required since `OccupiedEntry` can be used in `EntryRef`
directly.
The following methods have been removed:
```rust
// hash_map
impl OccupiedEntry {
fn replace_entry(self, value: V) -> (K, V);
fn replace_key(self) -> K;
}
impl EntryRef {
fn and_replace_entry_with<F>(self, f: F) -> Self;
}
impl VacantEntryRef {
fn into_key(self) -> K;
}
// hash_set
impl Entry {
fn replace(self) -> T;
}
```
The following methods have been added:
```rust
impl VacantENtry {
fn insert_entry(self, value: V) -> OccupiedEntry<'a, K, V, S, A>;
}
```
The following methods have their signatures changed:
```rust
impl EntryRef {
// Previously returned OccupiedEntryRef
fn insert(self, value: V) -> OccupiedEntry<'a, K, V, S, A>;
}
impl VacantEntryRef {
// Previously returned &Q
fn key(&self) -> &'b Q;
// Previously returned OccupiedEntryRef
fn insert(self, value: V) -> OccupiedEntry<'a, K, V, S, A>;
}
```
This mirrors the changes done in the main hashbrown API.
|
@bors r+ |
|
☀️ Test successful - checks-actions |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The main change in this PR is that
OccupiedEntryno longer holds thekey used in the initial
entrycall. As a result,OccupiedEntryRefisno longer required since
OccupiedEntrycan be used inEntryRefdirectly.
The following methods have been removed:
The following methods have been added:
The following methods have their signatures changed: