Diffstat (limited to 'src/macros/build.rs')
| -rw-r--r-- | src/macros/build.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/macros/build.rs b/src/macros/build.rs index 2a45c0a..380063b 100644 --- a/src/macros/build.rs +++ b/src/macros/build.rs @@ -1,4 +1,4 @@ -use crate::{effect::Blocking, transform, DefaultMode}; +use crate::{effect::blocking::Blocking, transform, DefaultMode}; #[macro_export] macro_rules! Build { @@ -45,18 +45,18 @@ macro_rules! Build { type Seed = ($(<$type as $crate::BuilderTypes>::Seed),*); #[inline(always)] - fn new_builders<'a>(seed: Self::Seed) -> $crate::effect::ObjSafe<'a, Self::Builders, E> { + fn new_builders<'a>(seed: Self::Seed) -> $crate::effect::ErasedEffective<'a, Self::Builders, E> { let ($($field),*) = seed; - use $crate::effect::Adapters; + use $crate::effect::Effective; - E::join( - $crate::effect::Join(($(<<$type as $crate::Build<'ctx, M, E>>::Builder as $crate::Builder::<E>>::from_seed($field),)*), $crate::hkt::Marker::default()) + $crate::effect::join( + ($(<<$type as $crate::Build<'ctx, M, E>>::Builder as $crate::Builder::<E>>::from_seed($field),)*) ).map(|($($field,)*)| { Builders { $($field),* } - }).into() + }).into_erased() // E::wrap(async move { // Builders { @@ -65,20 +65,20 @@ macro_rules! Build { // }) } - fn from_builders<'a>(builders: Self::Builders) -> $crate::effect::ObjSafe<'a, Result<Self::T, Self::Error>, E> { + fn from_builders<'a>(builders: Self::Builders) -> $crate::effect::ErasedEffective<'a, Result<Self::T, Self::Error>, E> { use $crate::Builder; - use $crate::effect::Adapters; + use $crate::effect::Effective; - E::try_join( - $crate::effect::Join(( - $(builders.$field.build().map(|x| x.map_err(Error::$field)).into(),)* - ), $crate::hkt::Marker::default()) + $crate::effect::try_join( + ( + $(|| builders.$field.build().map(|x| x.map_err(Error::$field)),)* + ) ).map(|result| match result { Ok(($($field,)*)) => Ok($name { $($field),* }), Err(err) => Err(err) - }).into() + }).into_erased() // E::wrap(async { // Ok($name { |