This commit is contained in:
xacrimon 2022-02-06 16:42:35 +01:00
parent fbb6ffb1d7
commit 45c7a3ca71
No known key found for this signature in database
GPG Key ID: FE567F46AFBDF3AE
5 changed files with 23 additions and 23 deletions

View File

@ -28,7 +28,7 @@ impl<'a, K: Eq + Hash, V, S: BuildHasher> Entry<'a, K, V, S> {
}
/// Get the key of the entry.
pub fn key<'r>(&'r self) -> &'r K {
pub fn key(&self) -> &K {
match *self {
Entry::Occupied(ref entry) => entry.key(),
Entry::Vacant(ref entry) => entry.key(),
@ -125,7 +125,7 @@ impl<'a, K: Eq + Hash, V, S: BuildHasher> VacantEntry<'a, K, V, S> {
self.key
}
pub fn key<'r>(&'r self) -> &'r K {
pub fn key(&self) -> &K {
&self.key
}
}
@ -152,11 +152,11 @@ impl<'a, K: Eq + Hash, V, S: BuildHasher> OccupiedEntry<'a, K, V, S> {
Self { shard, elem, key }
}
pub fn get<'r>(&'r self) -> &'r V {
pub fn get(&self) -> &V {
self.elem.1
}
pub fn get_mut<'r>(&'r mut self) -> &'r mut V {
pub fn get_mut(&mut self) -> &mut V {
self.elem.1
}
@ -172,7 +172,7 @@ impl<'a, K: Eq + Hash, V, S: BuildHasher> OccupiedEntry<'a, K, V, S> {
self.key
}
pub fn key<'r>(&'r self) -> &'r K {
pub fn key(&self) -> &K {
self.elem.0
}

View File

@ -32,15 +32,15 @@ impl<'a, K: Eq + Hash, V, S: BuildHasher> RefMulti<'a, K, V, S> {
}
}
pub fn key<'r>(&'r self) -> &'r K {
pub fn key(&self) -> &K {
self.k
}
pub fn value<'r>(&'r self) -> &'r V {
pub fn value(&self) -> &V {
self.v
}
pub fn pair<'r>(&'r self) -> (&'r K, &'r V) {
pub fn pair(&self) -> (&K, &V) {
(self.k, self.v)
}
}
@ -79,23 +79,23 @@ impl<'a, K: Eq + Hash, V, S: BuildHasher> RefMutMulti<'a, K, V, S> {
}
}
pub fn key<'r>(&'r self) -> &'r K {
pub fn key(&self) -> &K {
self.k
}
pub fn value<'r>(&'r self) -> &'r V {
pub fn value(&self) -> &V {
self.v
}
pub fn value_mut<'r>(&'r mut self) -> &'r mut V {
pub fn value_mut(&mut self) -> &mut V {
self.v
}
pub fn pair<'r>(&'r self) -> (&'r K, &'r V) {
pub fn pair(&self) -> (&K, &V) {
(self.k, self.v)
}
pub fn pair_mut<'r>(&'r mut self) -> (&'r K, &'r mut V) {
pub fn pair_mut(&mut self) -> (&K, &mut V) {
(self.k, self.v)
}
}

View File

@ -26,15 +26,15 @@ impl<'a, K: Eq + Hash, V, S: BuildHasher> Ref<'a, K, V, S> {
}
}
pub fn key<'r>(&'r self) -> &'r K {
pub fn key(&self) -> &K {
self.k
}
pub fn value<'r>(&'r self) -> &'r V {
pub fn value(&self) -> &V {
self.v
}
pub fn pair<'r>(&'r self) -> (&'r K, &'r V) {
pub fn pair(&self) -> (&K, &V) {
(self.k, self.v)
}
}
@ -69,23 +69,23 @@ impl<'a, K: Eq + Hash, V, S: BuildHasher> RefMut<'a, K, V, S> {
Self { guard, k, v }
}
pub fn key<'r>(&'r self) -> &'r K {
pub fn key(&self) -> &K {
self.k
}
pub fn value<'r>(&'r self) -> &'r V {
pub fn value(&self) -> &V {
self.v
}
pub fn value_mut<'r>(&'r mut self) -> &'r mut V {
pub fn value_mut(&mut self) -> &mut V {
self.v
}
pub fn pair<'r>(&'r self) -> (&'r K, &'r V) {
pub fn pair(&self) -> (&K, &V) {
(self.k, self.v)
}
pub fn pair_mut<'r>(&'r mut self) -> (&'r K, &'r mut V) {
pub fn pair_mut(&mut self) -> (&K, &mut V) {
(self.k, self.v)
}

View File

@ -11,7 +11,7 @@ impl<'a, K: Eq + Hash, S: BuildHasher> RefMulti<'a, K, S> {
Self { inner }
}
pub fn key<'r>(&'r self) -> &'r K {
pub fn key(&self) -> &K {
self.inner.key()
}
}

View File

@ -15,7 +15,7 @@ impl<'a, K: Eq + Hash, S: BuildHasher> Ref<'a, K, S> {
Self { inner }
}
pub fn key<'r>(&'r self) -> &'r K {
pub fn key(&self) -> &K {
self.inner.key()
}
}