func restructuring

src/flow/speculative.rs

@@ -1,6 +1,4 @@
-use fail::*;
+use crate::func::{applicative_select::*, fail::*, *};
-
-use crate::func::*;
 
 type Frwa<'a, A, E0, E1, Fallible> =
     Wrap<'a, Result<WrapE<'a, A, E0, Fallible>, E1>, <Fallible as MonadFailAny<'a>>::T>;

src/func.rs

@@ -7,12 +7,12 @@
 //! * <https://hackage.haskell.org/package/base-4.18.0.0/docs/Control-Applicative.html>
 //! * <https://hackage.haskell.org/package/base-4.18.0.0/docs/Control-Monad.html>
 
-mod applicative_select;
+pub mod applicative_select;
 pub mod class_prelude;
 pub mod context;
 pub mod controlflow;
 pub mod derivations;
-mod extensions;
+pub mod extensions;
 pub mod fail;
 pub mod instances;
 pub mod local;
@@ -23,9 +23,7 @@ pub mod test_suite;
 pub mod tests;
 pub mod weakfunctorany;
 
-pub use self::applicative_select::{
+use self::applicative_select::ApplicativeSelect;
-    ApplicativeSelect, ApplicativeSelectExt, Selected, SelectedWrapped,
-};
 use self::controlflow::{ControlFlow, Iterative};
 pub use self::extensions::MonadExt;
 
@@ -126,5 +124,3 @@ pub trait Monad<'a>: Applicative<'a> {
         Self::bind(ffa, |fa| fa)
     }
 }
-
-impl<'a, T: Monad<'a>> MonadExt<'a> for T {}

src/func/class_prelude.rs

@@ -1,4 +1,5 @@
 pub use super::{
+    applicative_select::{ApplicativeSelect, ApplicativeSelectExt, Selected, SelectedWrapped},
     controlflow::{ControlFlow, Iterative, IterativeWrapped},
     extensions::MonadExt,
     fail::{Fail, MonadFail, MonadFailAny, MonadFailAnyExt, WrapE},
@@ -6,8 +7,8 @@ pub use super::{
     local::LocalFunctor,
     shared::{SharedFunctor, SharedFunctorAny},
     weakfunctorany::WeakFunctorAny,
-    Applicative, ApplicativeLA2, ApplicativeSelect, ApplicativeSelectExt, ApplicativeSeq,
+    Applicative, ApplicativeLA2, ApplicativeSeq, ApplicativeTuple, Functor, Monad, Pure,
-    ApplicativeTuple, Functor, Monad, Pure, Selected, SelectedWrapped, WeakFunctor, Wrap,
+    WeakFunctor, Wrap,
 };
 #[cfg(test)]
 pub use super::{test_suite, tests};

src/func/extensions.rs

@@ -20,3 +20,5 @@ pub trait MonadExt<'a>: Monad<'a> {
         Self::join(Self::la2(fa, fb, f))
     }
 }
+
+impl<'a, T: Monad<'a>> MonadExt<'a> for T {}