From a067d041f4235ae03016392df6004ba0233d19cf Mon Sep 17 00:00:00 2001 From: timofey Date: Sun, 18 Jun 2023 11:51:03 +0000 Subject: [PATCH] move `ControlFlow` to `func::controlflow` --- src/func.rs | 5 +---- src/func/controlflow.rs | 1 + src/func/extensions.rs | 2 +- src/func/local.rs | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/func.rs b/src/func.rs index 8de894b..397e1a1 100644 --- a/src/func.rs +++ b/src/func.rs @@ -22,13 +22,10 @@ pub mod test_suite; #[cfg(test)] pub mod tests; -pub use std::ops::ControlFlow; - pub use self::applicative_select::{ ApplicativeSelect, ApplicativeSelectExt, Selected, SelectedWrapped, }; -use self::controlflow::{BindableMut, ControlFlowInstance}; -pub use self::controlflow::{Iterative, IterativeWrapped}; +pub use self::controlflow::{ControlFlow, Iterative, IterativeWrapped}; pub use self::extensions::MonadExt; #[cfg(doc)] use self::instances::stackless::StacklessInstance; diff --git a/src/func/controlflow.rs b/src/func/controlflow.rs index f00a042..74ddf94 100644 --- a/src/func/controlflow.rs +++ b/src/func/controlflow.rs @@ -1,4 +1,5 @@ use std::marker::PhantomData; +pub use std::ops::ControlFlow; use super::*; diff --git a/src/func/extensions.rs b/src/func/extensions.rs index e7f18cb..fbb2828 100644 --- a/src/func/extensions.rs +++ b/src/func/extensions.rs @@ -1,4 +1,4 @@ -use super::*; +use super::{controlflow::BindableMut, *}; pub trait MonadExt<'a>: Monad<'a> { /// [`FnMut`] version of [`Monad::iterate`]. diff --git a/src/func/local.rs b/src/func/local.rs index 373bdfa..05a7eba 100644 --- a/src/func/local.rs +++ b/src/func/local.rs @@ -1,4 +1,4 @@ -use super::*; +use super::{controlflow::ControlFlowInstance, *}; /// Represents wrapped results which are instantly available. pub trait LocalFunctor<'a>: WeakFunctor<'a> {