refactor(fp-core): adding functor and HKT into fp-core

JasonShin · Aug 5, 2019 · be7cc6a · be7cc6a
1 parent 783f5ed
commit be7cc6a
Show file tree

Hide file tree

Showing 41 changed files with 72 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,6 @@
-[package]
-name = "functional-programming-jargon"
-version = "0.1.0"
-authors = ["Jason Shin <visualbbasic@gmail.com>"]
-edition = "2018"
+[workspace]
 
-[dependencies]
-partial_application = "0.1.0"
-itertools = "0.8.0"
-rats = "0.0.1"
+members = [
+  "fp-examples",
+  "fp-core"
+]
diff --git a/fp-core/Cargo.toml b/fp-core/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "fp-core"
+version = "0.1.0"
+authors = ["Jason Shin <visualbbasic@gmail.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/fp-core/src/functor.rs b/fp-core/src/functor.rs
@@ -0,0 +1,16 @@
+use crate::hkt::HKT;
+
+pub trait Functor<A, B>: HKT<A, B> {
+    fn fmap<F>(self, f: F) -> <Self as HKT<A, B>>::Target
+    where
+        F: FnOnce(A) -> B;
+}
+
+impl<A, B> Functor<A, B> for Option<A> {
+    fn fmap<F>(self, f: F) -> Self::Target
+    where
+        F: FnOnce(A) -> B,
+    {
+        self.map(f)
+    }
+}
diff --git a/fp-core/src/hkt.rs b/fp-core/src/hkt.rs
@@ -0,0 +1,9 @@
+pub trait HKT<A, B> {
+    type URI;
+    type Target;
+}
+
+impl<A, B> HKT<A, B> for Option<A> {
+    type URI = Self;
+    type Target = Option<B>;
+}
diff --git a/fp-core/src/lib.rs b/fp-core/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod functor;
+pub mod hkt;
diff --git a/fp-examples/Cargo.toml b/fp-examples/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "fp-examples"
+version = "0.1.0"
+authors = ["Jason Shin <visualbbasic@gmail.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+partial_application = "0.1.0"
+itertools = "0.8.0"
+rats = "0.0.1"
+fp-core = { path = "../fp-core" }
diff --git a/src/adt_example.rs → fp-examples/src/adt_example.rs b/src/adt_example.rs → fp-examples/src/adt_example.rs
diff --git a/src/anamorphism_example.rs → fp-examples/src/anamorphism_example.rs b/src/anamorphism_example.rs → fp-examples/src/anamorphism_example.rs
diff --git a/src/applicative_example.rs → fp-examples/src/applicative_example.rs b/src/applicative_example.rs → fp-examples/src/applicative_example.rs
@@ -1,4 +1,5 @@
-use crate::functor_example::{Functor, HKT};
+use fp_core::functor::Functor;
+use fp_core::hkt::HKT;
 
 // HKT 3
 pub trait HKT3<A, B, C> {

diff --git a/src/arity_example.rs → fp-examples/src/arity_example.rs b/src/arity_example.rs → fp-examples/src/arity_example.rs
diff --git a/src/catamorphism_example.rs → fp-examples/src/catamorphism_example.rs b/src/catamorphism_example.rs → fp-examples/src/catamorphism_example.rs
diff --git a/src/closure_example.rs → fp-examples/src/closure_example.rs b/src/closure_example.rs → fp-examples/src/closure_example.rs
diff --git a/src/comonad_example.rs → fp-examples/src/comonad_example.rs b/src/comonad_example.rs → fp-examples/src/comonad_example.rs
@@ -1,4 +1,5 @@
-use crate::functor_example::{Functor, HKT};
+use fp_core::functor::Functor;
+use fp_core::hkt::HKT;
 
 trait Extend<A, B>: Functor<A, B> + Sized {
     fn extend<W>(self, f: W) -> <Self as HKT<A, B>>::Target

diff --git a/src/continuation.rs → fp-examples/src/continuation.rs b/src/continuation.rs → fp-examples/src/continuation.rs
diff --git a/src/contracts.rs → fp-examples/src/contracts.rs b/src/contracts.rs → fp-examples/src/contracts.rs
diff --git a/src/currying_example.rs → fp-examples/src/currying_example.rs b/src/currying_example.rs → fp-examples/src/currying_example.rs
diff --git a/src/endomorphism_example.rs → fp-examples/src/endomorphism_example.rs b/src/endomorphism_example.rs → fp-examples/src/endomorphism_example.rs
diff --git a/src/foldable_example.rs → fp-examples/src/foldable_example.rs b/src/foldable_example.rs → fp-examples/src/foldable_example.rs
diff --git a/src/function_composition_example.rs → ...mples/src/function_composition_example.rs b/src/function_composition_example.rs → ...mples/src/function_composition_example.rs
diff --git a/src/functor_example.rs → fp-examples/src/functor_example.rs b/src/functor_example.rs → fp-examples/src/functor_example.rs
@@ -1,27 +1,4 @@
-pub trait HKT<A, B> {
-    type URI;
-    type Target;
-}
-
-pub trait Functor<A, B>: HKT<A, B> {
-    fn fmap<F>(self, f: F) -> <Self as HKT<A, B>>::Target
-    where
-        F: FnOnce(A) -> B;
-}
-
-impl<A, B> HKT<A, B> for Option<A> {
-    type URI = Self;
-    type Target = Option<B>;
-}
-
-impl<A, B> Functor<A, B> for Option<A> {
-    fn fmap<F>(self, f: F) -> Self::Target
-    where
-        F: FnOnce(A) -> B,
-    {
-        self.map(f)
-    }
-}
+use fp_core::functor::Functor;
 
 // impl<A, B, T> HKT<A, B> for T
 // where

diff --git a/src/hof_example.rs → fp-examples/src/hof_example.rs b/src/hof_example.rs → fp-examples/src/hof_example.rs
diff --git a/src/homomorphism_example.rs → fp-examples/src/homomorphism_example.rs b/src/homomorphism_example.rs → fp-examples/src/homomorphism_example.rs
diff --git a/src/idempotent.rs → fp-examples/src/idempotent.rs b/src/idempotent.rs → fp-examples/src/idempotent.rs
diff --git a/src/isomorphism_example.rs → fp-examples/src/isomorphism_example.rs b/src/isomorphism_example.rs → fp-examples/src/isomorphism_example.rs
diff --git a/src/lambda_example.rs → fp-examples/src/lambda_example.rs b/src/lambda_example.rs → fp-examples/src/lambda_example.rs
diff --git a/src/lens_example.rs → fp-examples/src/lens_example.rs b/src/lens_example.rs → fp-examples/src/lens_example.rs
diff --git a/src/main.rs → fp-examples/src/main.rs b/src/main.rs → fp-examples/src/main.rs
@@ -1,8 +1,9 @@
 #[macro_use]
 extern crate partial_application;
+extern crate fp_core;
 extern crate rats;
 
-mod adt_example;
+pub mod adt_example;
 mod anamorphism_example;
 mod applicative_example;
 mod arity_example;
@@ -33,7 +34,3 @@ mod semigroup_example;
 mod setoid_example;
 mod side_effects_example;
 mod type_signature_example;
-
-fn main() {
-    println!("Hello, PureRust!");
-}
diff --git a/src/monad_example.rs → fp-examples/src/monad_example.rs b/src/monad_example.rs → fp-examples/src/monad_example.rs
@@ -1,5 +1,5 @@
 use crate::applicative_example::{Applicative, Pure};
-use crate::functor_example::HKT;
+use fp_core::hkt::HKT;
 
 pub trait Chain<A, B>: HKT<A, B> {
     fn chain<F>(self, f: F) -> <Self as HKT<A, B>>::Target

diff --git a/src/monoid_example.rs → fp-examples/src/monoid_example.rs b/src/monoid_example.rs → fp-examples/src/monoid_example.rs
diff --git a/src/option_example.rs → fp-examples/src/option_example.rs b/src/option_example.rs → fp-examples/src/option_example.rs
diff --git a/src/partial_application_example.rs → ...amples/src/partial_application_example.rs b/src/partial_application_example.rs → ...amples/src/partial_application_example.rs
diff --git a/src/pointed_functor_example.rs → fp-examples/src/pointed_functor_example.rs b/src/pointed_functor_example.rs → fp-examples/src/pointed_functor_example.rs
diff --git a/src/predicate_example.rs → fp-examples/src/predicate_example.rs b/src/predicate_example.rs → fp-examples/src/predicate_example.rs
diff --git a/src/purity_example.rs → fp-examples/src/purity_example.rs b/src/purity_example.rs → fp-examples/src/purity_example.rs
diff --git a/src/referential_transparency_example.rs → ...s/src/referential_transparency_example.rs b/src/referential_transparency_example.rs → ...s/src/referential_transparency_example.rs
diff --git a/src/semigroup_example.rs → fp-examples/src/semigroup_example.rs b/src/semigroup_example.rs → fp-examples/src/semigroup_example.rs
diff --git a/src/setoid_example.rs → fp-examples/src/setoid_example.rs b/src/setoid_example.rs → fp-examples/src/setoid_example.rs
diff --git a/src/side_effects_example.rs → fp-examples/src/side_effects_example.rs b/src/side_effects_example.rs → fp-examples/src/side_effects_example.rs
diff --git a/src/type_signature_example.rs → fp-examples/src/type_signature_example.rs b/src/type_signature_example.rs → fp-examples/src/type_signature_example.rs
diff --git a/src/value.rs → fp-examples/src/value.rs b/src/value.rs → fp-examples/src/value.rs