studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify MutexMap generic constraints.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2026-01-13 07:33:31 +00:00
parent 05898034e5
commit cf8b57b751
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/utils/mutex_map.rs
View File

@@ -1,4 +1,5 @@
use std::{
borrow::ToOwned,
fmt::Debug,
hash::Hash,
sync::{Arc, TryLockError::WouldBlock},
@@ -38,17 +39,15 @@ where
}
#[tracing::instrument(level = "trace", skip(self))]
pub async fn lock<'a, K>(&'a self, k: &'a K) -> Guard<Key, Val>
pub async fn lock<K>(&self, k: &K) -> Guard<Key, Val>
where
K: Debug + Send + ?Sized + Sync,
Key: TryFrom<&'a K>,
<Key as TryFrom<&'a K>>::Error: Debug,
K: Debug + Send + ?Sized + Sync + ToOwned<Owned = Key>,
{
let val = self
.map
.lock()
.expect("locked")
.entry(k.try_into().expect("failed to construct key"))
.entry(k.to_owned())
.or_default()
.clone();
@@ -59,17 +58,15 @@ where
}
#[tracing::instrument(level = "trace", skip(self))]
pub fn try_lock<'a, K>(&self, k: &'a K) -> Result<Guard<Key, Val>>
pub fn try_lock<K>(&self, k: &K) -> Result<Guard<Key, Val>>
where
K: Debug + Send + ?Sized + Sync,
Key: TryFrom<&'a K>,
<Key as TryFrom<&'a K>>::Error: Debug,
K: Debug + Send + ?Sized + Sync + ToOwned<Owned = Key>,
{
let val = self
.map
.lock()
.expect("locked")
.entry(k.try_into().expect("failed to construct key"))
.entry(k.to_owned())
.or_default()
.clone();
@@ -82,11 +79,9 @@ where
}
#[tracing::instrument(level = "trace", skip(self))]
pub fn try_try_lock<'a, K>(&self, k: &'a K) -> Result<Guard<Key, Val>>
pub fn try_try_lock<K>(&self, k: &K) -> Result<Guard<Key, Val>>
where
K: Debug + Send + ?Sized + Sync,
Key: TryFrom<&'a K>,
<Key as TryFrom<&'a K>>::Error: Debug,
K: Debug + Send + ?Sized + Sync + ToOwned<Owned = Key>,
{
let val = self
.map
@@ -95,7 +90,7 @@ where
| WouldBlock => err!("would block"),
| _ => panic!("{e:?}"),
})?
.entry(k.try_into().expect("failed to construct key"))
.entry(k.to_owned())
.or_default()
.clone();