remove mappable and mappablemut traits

packages/generational-box/src/references.rs

@@ -1,83 +1,41 @@
 use std::{
     fmt::{Debug, Display},
-    marker::PhantomData,
     ops::{Deref, DerefMut},
 };
 
-use crate::{Mappable, MappableMut};
-
 /// A reference to a value in a generational box.
-pub struct GenerationalRef<T: ?Sized + 'static, R: Mappable<T>> {
-    inner: R,
-    phantom: PhantomData<T>,
+pub struct GenerationalRef<R> {
+    pub(crate) inner: R,
     #[cfg(any(debug_assertions, feature = "debug_borrows"))]
-    borrow: GenerationalRefBorrowInfo,
+    pub(crate) borrow: GenerationalRefBorrowInfo,
 }
 
-impl<T: 'static, R: Mappable<T>> GenerationalRef<T, R> {
+impl<T: 'static, R: Deref<Target = T>> GenerationalRef<R> {
     pub(crate) fn new(
         inner: R,
         #[cfg(any(debug_assertions, feature = "debug_borrows"))] borrow: GenerationalRefBorrowInfo,
     ) -> Self {
         Self {
             inner,
-            phantom: PhantomData,
             #[cfg(any(debug_assertions, feature = "debug_borrows"))]
             borrow,
         }
     }
 }
 
-impl<T: ?Sized + 'static, R: Mappable<T>> Mappable<T> for GenerationalRef<T, R> {
-    type Mapped<U: ?Sized + 'static> = GenerationalRef<U, R::Mapped<U>>;
-
-    fn map<U: ?Sized + 'static>(_self: Self, f: impl FnOnce(&T) -> &U) -> Self::Mapped<U> {
-        GenerationalRef {
-            inner: R::map(_self.inner, f),
-            phantom: PhantomData,
-            #[cfg(any(debug_assertions, feature = "debug_borrows"))]
-            borrow: GenerationalRefBorrowInfo {
-                borrowed_at: _self.borrow.borrowed_at,
-                borrowed_from: _self.borrow.borrowed_from,
-            },
-        }
-    }
-
-    fn try_map<U: ?Sized + 'static>(
-        _self: Self,
-        f: impl FnOnce(&T) -> Option<&U>,
-    ) -> Option<Self::Mapped<U>> {
-        let Self {
-            inner,
-            #[cfg(any(debug_assertions, feature = "debug_borrows"))]
-            borrow,
-            ..
-        } = _self;
-        R::try_map(inner, f).map(|inner| GenerationalRef {
-            inner,
-            phantom: PhantomData,
-            #[cfg(any(debug_assertions, feature = "debug_borrows"))]
-            borrow: GenerationalRefBorrowInfo {
-                borrowed_at: borrow.borrowed_at,
-                borrowed_from: borrow.borrowed_from,
-            },
-        })
-    }
-}
-
-impl<T: ?Sized + Debug, R: Mappable<T>> Debug for GenerationalRef<T, R> {
+impl<T: ?Sized + Debug, R: Deref<Target = T>> Debug for GenerationalRef<R> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.inner.deref().fmt(f)
     }
 }
 
-impl<T: ?Sized + Display, R: Mappable<T>> Display for GenerationalRef<T, R> {
+impl<T: ?Sized + Display, R: Deref<Target = T>> Display for GenerationalRef<R> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.inner.deref().fmt(f)
     }
 }
 
-impl<T: ?Sized + 'static, R: Mappable<T>> Deref for GenerationalRef<T, R> {
+impl<T: ?Sized + 'static, R: Deref<Target = T>> Deref for GenerationalRef<R> {
     type Target = T;
 
     fn deref(&self) -> &Self::Target {
@@ -103,14 +61,13 @@ impl Drop for GenerationalRefBorrowInfo {
 }
 
 /// A mutable reference to a value in a generational box.
-pub struct GenerationalRefMut<T: ?Sized + 'static, W: MappableMut<T>> {
-    inner: W,
-    phantom: PhantomData<T>,
+pub struct GenerationalRefMut<W> {
+    pub(crate) inner: W,
     #[cfg(any(debug_assertions, feature = "debug_borrows"))]
-    borrow: GenerationalRefMutBorrowInfo,
+    pub(crate) borrow: GenerationalRefMutBorrowInfo,
 }
 
-impl<T: 'static, R: MappableMut<T>> GenerationalRefMut<T, R> {
+impl<T: 'static, R: DerefMut<Target = T>> GenerationalRefMut<R> {
     pub(crate) fn new(
         inner: R,
         #[cfg(any(debug_assertions, feature = "debug_borrows"))]
@@ -118,45 +75,13 @@ impl<T: 'static, R: MappableMut<T>> GenerationalRefMut<T, R> {
     ) -> Self {
         Self {
             inner,
-            phantom: PhantomData,
             #[cfg(any(debug_assertions, feature = "debug_borrows"))]
             borrow,
         }
     }
 }
 
-impl<T: ?Sized + 'static, W: MappableMut<T>> MappableMut<T> for GenerationalRefMut<T, W> {
-    type Mapped<U: ?Sized + 'static> = GenerationalRefMut<U, W::Mapped<U>>;
-
-    fn map<U: ?Sized + 'static>(_self: Self, f: impl FnOnce(&mut T) -> &mut U) -> Self::Mapped<U> {
-        GenerationalRefMut {
-            inner: W::map(_self.inner, f),
-            phantom: PhantomData,
-            #[cfg(any(debug_assertions, feature = "debug_borrows"))]
-            borrow: _self.borrow,
-        }
-    }
-
-    fn try_map<U: ?Sized + 'static>(
-        _self: Self,
-        f: impl FnOnce(&mut T) -> Option<&mut U>,
-    ) -> Option<Self::Mapped<U>> {
-        let Self {
-            inner,
-            #[cfg(any(debug_assertions, feature = "debug_borrows"))]
-            borrow,
-            ..
-        } = _self;
-        W::try_map(inner, f).map(|inner| GenerationalRefMut {
-            inner,
-            phantom: PhantomData,
-            #[cfg(any(debug_assertions, feature = "debug_borrows"))]
-            borrow,
-        })
-    }
-}
-
-impl<T: ?Sized + 'static, W: MappableMut<T>> Deref for GenerationalRefMut<T, W> {
+impl<T: ?Sized + 'static, W: DerefMut<Target = T>> Deref for GenerationalRefMut<W> {
     type Target = T;
 
     fn deref(&self) -> &Self::Target {
@@ -164,7 +89,7 @@ impl<T: ?Sized + 'static, W: MappableMut<T>> Deref for GenerationalRefMut<T, W>
     }
 }
 
-impl<T: ?Sized + 'static, W: MappableMut<T>> DerefMut for GenerationalRefMut<T, W> {
+impl<T: ?Sized + 'static, W: DerefMut<Target = T>> DerefMut for GenerationalRefMut<W> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.inner.deref_mut()
     }