Restrict mapping function bounds to prevent possible UB until it has …

…been proven safe
Amanieu · Aug 25, 2021 · de6920c · de6920c
1 parent a89fb5c
commit de6920c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lock_api/src/mutex.rs b/lock_api/src/mutex.rs
@@ -509,8 +509,7 @@ impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> MutexGuard<'a, R, T> {
     #[inline]
     pub fn map<U, F>(s: Self, f: F) -> MappedMutexGuard<'a, R, U>
     where
-        F: FnOnce(&'a mut T) -> U,
-        U: 'a,
+        F: FnOnce(&mut T) -> U,
     {
         let raw = &s.mutex.raw;
         let data = unsafe { &mut *s.mutex.data.get() };
@@ -536,7 +535,7 @@ impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> MutexGuard<'a, R, T> {
     #[inline]
     pub fn try_map<U, F>(s: Self, f: F) -> Result<MappedMutexGuard<'a, R, U>, Self>
     where
-        F: FnOnce(&'a mut T) -> Option<U>,
+        F: FnOnce(&mut T) -> Option<U>,
     {
         let raw = &s.mutex.raw;
         let data = unsafe { &mut *s.mutex.data.get() };

diff --git a/lock_api/src/rwlock.rs b/lock_api/src/rwlock.rs
@@ -1186,7 +1186,7 @@ impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> RwLockReadGuard<'a, R, T> {
     #[inline]
     pub fn map<U, F>(s: Self, f: F) -> MappedRwLockReadGuard<'a, R, U>
     where
-        F: FnOnce(&'a T) -> U,
+        F: FnOnce(&T) -> U,
     {
         let raw = &s.rwlock.raw;
         let data = f(unsafe { &*s.rwlock.data.get() });
@@ -1210,7 +1210,7 @@ impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> RwLockReadGuard<'a, R, T> {
     #[inline]
     pub fn try_map<U, F>(s: Self, f: F) -> Result<MappedRwLockReadGuard<'a, R, U>, Self>
     where
-        F: FnOnce(&'a T) -> Option<U>,
+        F: FnOnce(&T) -> Option<U>,
     {
         let raw = &s.rwlock.raw;
         let data = match f(unsafe { &*s.rwlock.data.get() }) {
@@ -1474,7 +1474,7 @@ impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> RwLockWriteGuard<'a, R, T> {
     #[inline]
     pub fn map<U, F>(s: Self, f: F) -> MappedRwLockWriteGuard<'a, R, U>
     where
-        F: FnOnce(&'a mut T) -> U,
+        F: FnOnce(&mut T) -> U,
     {
         let raw = &s.rwlock.raw;
         let data = f(unsafe { &mut *s.rwlock.data.get() });
@@ -1498,7 +1498,7 @@ impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> RwLockWriteGuard<'a, R, T> {
     #[inline]
     pub fn try_map<U, F>(s: Self, f: F) -> Result<MappedRwLockWriteGuard<'a, R, U>, Self>
     where
-        F: FnOnce(&'a mut T) -> Option<U>,
+        F: FnOnce(&mut T) -> Option<U>,
     {
         let raw = &s.rwlock.raw;
         let data = match f(unsafe { &mut *s.rwlock.data.get() }) {