Refactoring

Smallibs · Sep 15, 2023 · 5fa3edd · 5fa3edd
1 parent 2c51b7a
commit 5fa3edd
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 24 deletions.
diff --git a/src/core/transform.rs b/src/core/transform.rs
@@ -3,9 +3,9 @@ use crate::core::hkp::HKP;
 pub trait Transform<'a, A>: HKP<'a> {
     type This: HKP<'a>;
 
-    fn from_hkp<B>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B>;
+    fn hkp_to_self<B>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B>;
 
-    fn from_self<B>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B>;
+    fn self_to_hkp<B>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B>;
 
     fn to_hkp(self) -> <Self::This as HKP<'a>>::T<A>;
 }
diff --git a/src/specs/applicative.rs b/src/specs/applicative.rs
@@ -20,7 +20,7 @@ pub mod infix {
         type TL<B: 'a>: Applicative<'a, B>;
 
         fn pure<B>(a: B) -> Self::T<B> {
-            Self::from_hkp(Self::This::pure(a))
+            Self::hkp_to_self(Self::This::pure(a))
         }
 
         fn apply<B, MAP>(self, mf: Self::T<MAP>) -> Self::T<B>
@@ -29,7 +29,10 @@ pub mod infix {
             MAP: Fn(A) -> B,
             Self: Sized,
         {
-            Self::from_hkp(Self::This::apply(Self::from_self::<MAP>(mf), self.to_hkp()))
+            Self::hkp_to_self(Self::This::apply(
+                Self::self_to_hkp::<MAP>(mf),
+                self.to_hkp(),
+            ))
         }
     }
 }
diff --git a/src/specs/bind.rs b/src/specs/bind.rs
@@ -23,8 +23,8 @@ pub mod infix {
         type TL<B: 'a>: Bind<'a, B>;
 
         fn join<B>(mma: Self::T<Self::T<B>>) -> Self::T<B> {
-            Self::from_hkp(Self::This::bind(Self::from_self(mma), |a| {
-                Self::from_self::<B>(a)
+            Self::hkp_to_self(Self::This::bind(Self::self_to_hkp(mma), |a| {
+                Self::self_to_hkp::<B>(a)
             }))
         }
 
@@ -33,8 +33,8 @@ pub mod infix {
             BIND: Fn(A) -> Self::T<B> + 'a,
             Self: Sized,
         {
-            Self::from_hkp(Self::This::bind(self.to_hkp(), move |a| {
-                Self::from_self::<B>(mf(a))
+            Self::hkp_to_self(Self::This::bind(self.to_hkp(), move |a| {
+                Self::self_to_hkp::<B>(mf(a))
             }))
         }
     }

diff --git a/src/specs/functor.rs b/src/specs/functor.rs
@@ -19,7 +19,7 @@ pub mod infix {
             MAP: Fn(A) -> B + 'a,
             Self: Sized,
         {
-            Self::from_hkp(Self::This::map(f, self.to_hkp()))
+            Self::hkp_to_self(Self::This::map(f, self.to_hkp()))
         }
     }
 }
diff --git a/src/specs/monad.rs b/src/specs/monad.rs
@@ -17,12 +17,12 @@ pub mod infix {
         type TL<B: 'a>: Monad<'a, B>;
 
         fn returns<B>(b: B) -> Self::T<B> {
-            Self::from_hkp(Self::This::returns(b))
+            Self::hkp_to_self(Self::This::returns(b))
         }
 
         fn join<B>(mma: Self::T<Self::T<B>>) -> Self::T<B> {
-            Self::from_hkp(<Self::This as Bind>::bind(Self::from_self(mma), |a| {
-                Self::from_self::<B>(a)
+            Self::hkp_to_self(<Self::This as Bind>::bind(Self::self_to_hkp(mma), |a| {
+                Self::self_to_hkp::<B>(a)
             }))
         }
 
@@ -31,8 +31,8 @@ pub mod infix {
             BIND: Fn(A) -> Self::T<B> + 'a,
             Self: Sized,
         {
-            Self::from_hkp(<Self::This as Bind>::bind(self.to_hkp(), move |a| {
-                Self::from_self::<B>(mf(a))
+            Self::hkp_to_self(<Self::This as Bind>::bind(self.to_hkp(), move |a| {
+                Self::self_to_hkp::<B>(mf(a))
             }))
         }
     }

diff --git a/src/standard/either.rs b/src/standard/either.rs
@@ -75,11 +75,11 @@ mod infix {
     impl<'a, L, R: 'a> Transform<'a, R> for Either<L, R> {
         type This = EitherK<L>;
 
-        fn from_hkp<B: 'a>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B> {
+        fn hkp_to_self<B: 'a>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B> {
             a
         }
 
-        fn from_self<B: 'a>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B> {
+        fn self_to_hkp<B: 'a>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B> {
             a
         }
 

diff --git a/src/standard/identity.rs b/src/standard/identity.rs
@@ -60,11 +60,11 @@ pub mod infix {
     impl<'a, A: 'a> Transform<'a, A> for Identity<A> {
         type This = IdentityK;
 
-        fn from_hkp<B: 'a>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B> {
+        fn hkp_to_self<B: 'a>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B> {
             a
         }
 
-        fn from_self<B: 'a>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B> {
+        fn self_to_hkp<B: 'a>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B> {
             a
         }
 

diff --git a/src/standard/option.rs b/src/standard/option.rs
@@ -62,11 +62,11 @@ pub mod infix {
     impl<'a, A: 'a> Transform<'a, A> for Option<A> {
         type This = OptionK;
 
-        fn from_hkp<B: 'a>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B> {
+        fn hkp_to_self<B: 'a>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B> {
             a
         }
 
-        fn from_self<B: 'a>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B> {
+        fn self_to_hkp<B: 'a>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B> {
             a
         }
 

diff --git a/src/standard/result.rs b/src/standard/result.rs
@@ -66,11 +66,11 @@ mod infix {
     impl<'a, A: 'a, E> Transform<'a, A> for Result<A, E> {
         type This = ResultK<E>;
 
-        fn from_hkp<B: 'a>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B> {
+        fn hkp_to_self<B: 'a>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B> {
             a
         }
 
-        fn from_self<B: 'a>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B> {
+        fn self_to_hkp<B: 'a>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B> {
             a
         }
 

diff --git a/src/standard/vec.rs b/src/standard/vec.rs
@@ -65,11 +65,11 @@ pub mod infix {
     impl<'a, A: 'a> Transform<'a, A> for Vec<A> {
         type This = VecK;
 
-        fn from_hkp<B: 'a>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B> {
+        fn hkp_to_self<B: 'a>(a: <Self::This as HKP<'a>>::T<B>) -> Self::T<B> {
             a
         }
 
-        fn from_self<B: 'a>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B> {
+        fn self_to_hkp<B: 'a>(a: Self::T<B>) -> <Self::This as HKP<'a>>::T<B> {
             a
         }