Skip to content

Relax constraint in hash_map::EntryRef insertion methods K: From<&Q> to &Q: Into<K> #611

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 1 commit into from
Apr 5, 2025
+14 −7
Merged

Relax constraint in hash_map::EntryRef insertion methods K: From<&Q> to &Q: Into<K> #611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 deletions src/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4131,7 +4131,8 @@ impl<'a, 'b, K, Q: ?Sized, V, S, A: Allocator> EntryRef<'a, 'b, K, Q, V, S, A> {
#[cfg_attr(feature = "inline-more", inline)]
pub fn insert(self, value: V) -> OccupiedEntry<'a, K, V, S, A>
where
K: Hash + From<&'b Q>,
K: Hash,
&'b Q: Into<K>,
S: BuildHasher,
{
match self {
Expand Down Expand Up @@ -4164,7 +4165,8 @@ impl<'a, 'b, K, Q: ?Sized, V, S, A: Allocator> EntryRef<'a, 'b, K, Q, V, S, A> {
#[cfg_attr(feature = "inline-more", inline)]
pub fn or_insert(self, default: V) -> &'a mut V
where
K: Hash + From<&'b Q>,
K: Hash,
&'b Q: Into<K>,
S: BuildHasher,
{
match self {
Expand Down Expand Up @@ -4194,7 +4196,8 @@ impl<'a, 'b, K, Q: ?Sized, V, S, A: Allocator> EntryRef<'a, 'b, K, Q, V, S, A> {
#[cfg_attr(feature = "inline-more", inline)]
pub fn or_insert_with<F: FnOnce() -> V>(self, default: F) -> &'a mut V
where
K: Hash + From<&'b Q>,
K: Hash,
&'b Q: Into<K>,
S: BuildHasher,
{
match self {
Expand Down Expand Up @@ -4225,7 +4228,8 @@ impl<'a, 'b, K, Q: ?Sized, V, S, A: Allocator> EntryRef<'a, 'b, K, Q, V, S, A> {
#[cfg_attr(feature = "inline-more", inline)]
pub fn or_insert_with_key<F: FnOnce(&Q) -> V>(self, default: F) -> &'a mut V
where
K: Hash + Borrow<Q> + From<&'b Q>,
K: Hash + Borrow<Q>,
&'b Q: Into<K>,
S: BuildHasher,
{
match self {
Expand Down Expand Up @@ -4320,7 +4324,8 @@ impl<'a, 'b, K, Q: ?Sized, V: Default, S, A: Allocator> EntryRef<'a, 'b, K, Q, V
#[cfg_attr(feature = "inline-more", inline)]
pub fn or_default(self) -> &'a mut V
where
K: Hash + From<&'b Q>,
K: Hash,
&'b Q: Into<K>,
S: BuildHasher,
{
match self {
Expand Down Expand Up @@ -4368,7 +4373,8 @@ impl<'a, 'b, K, Q: ?Sized, V, S, A: Allocator> VacantEntryRef<'a, 'b, K, Q, V, S
#[cfg_attr(feature = "inline-more", inline)]
pub fn insert(self, value: V) -> &'a mut V
where
K: Hash + From<&'b Q>,
K: Hash,
&'b Q: Into<K>,
S: BuildHasher,
{
let table = &mut self.table.table;
Expand Down Expand Up @@ -4399,7 +4405,8 @@ impl<'a, 'b, K, Q: ?Sized, V, S, A: Allocator> VacantEntryRef<'a, 'b, K, Q, V, S
#[cfg_attr(feature = "inline-more", inline)]
pub fn insert_entry(self, value: V) -> OccupiedEntry<'a, K, V, S, A>
where
K: Hash + From<&'b Q>,
K: Hash,
&'b Q: Into<K>,
S: BuildHasher,
{
let elem = self.table.table.insert(
Expand Down