diff --git a/src/rcore.rs b/src/rcore.rs index 1ca6e63..580023b 100644 --- a/src/rcore.rs +++ b/src/rcore.rs @@ -34,8 +34,8 @@ pub use self::inctx::InCtx; pub use self::inlining::{Inlining, InliningExt, InliningResultExt}; pub use self::modes::{ ExtensionResult, ExtensionResultM, ExtensionResultP, ExtensionSource, ExtensionSourceM, - ExtensionSourceP, FactoryModeParse, FactoryModeProxy, ImplMode, Mode, ModeResult, ModeResultP, - ParseMode, ParseModeExt, ParseResultM, ParseSuccess, ParseSuccessP, QRegularFactory, + ExtensionSourceP, FactoryModeParse, FactoryModeProxy, ImplMode, Mode, ModeResult, ModeResultM, + ModeResultP, ParseMode, ParseModeExt, ParseSuccess, ParseSuccessP, QRegularFactory, RegularFactory, RegularMode, WithMode, WithParseMode, }; pub use self::origin::{OFctr, Origin}; diff --git a/src/rcore/modes.rs b/src/rcore/modes.rs index 0c82092..a81f1ff 100644 --- a/src/rcore/modes.rs +++ b/src/rcore/modes.rs @@ -241,15 +241,18 @@ where type _Mtbl = Self::Mtbl; } -pub type ParseResultM<'a, Ctx, F, I> = ModeResultP, ParseError<'a, Ctx, F>, I>; +/// [`FactoryParse`] equivalent of [`ModeResult`]. +pub type ModeResultM<'a, Ctx, F, I> = ModeResultP, ParseError<'a, Ctx, F>, I>; +/// [`FactoryParse`] equivalent of [`ExtensionResult`]. pub type ExtensionResultM<'a, Ctx, F> = ExtensionResultP, ParseError<'a, Ctx, F>>; +/// [`FactoryParse`] equivalent of [`ExtensionSource`]. pub type ExtensionSourceM<'a, Ctx, F> = ExtensionSourceP>; pub trait FactoryModeParse<'a, Ctx: Context<'a>>: FactoryBase<'a, Ctx> + ParseMode { - fn mdeserialize>(&self, inctx: I) -> ParseResultM<'a, Ctx, Self, I>; + fn mdeserialize>(&self, inctx: I) -> ModeResultM<'a, Ctx, Self, I>; fn mextend( &self, @@ -261,8 +264,7 @@ pub trait FactoryModeParse<'a, Ctx: Context<'a>>: FactoryBase<'a, Ctx> + ParseMo pub trait FactoryModeProxy<'a, Ctx: Context<'a>> { type F: FactoryBase<'a, Ctx> + ParseMode; - fn pmdeserialize>(f: &Self::F, inctx: I) - -> ParseResultM<'a, Ctx, Self::F, I>; + fn pmdeserialize>(f: &Self::F, inctx: I) -> ModeResultM<'a, Ctx, Self::F, I>; fn pmextend( f: &Self::F, @@ -275,7 +277,7 @@ impl<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx> + WithParseMode> FactoryModeP where F::WithMode: FactoryModeProxy<'a, Ctx, F = F>, { - fn mdeserialize>(&self, inctx: I) -> ParseResultM<'a, Ctx, Self, I> { + fn mdeserialize>(&self, inctx: I) -> ModeResultM<'a, Ctx, Self, I> { >::pmdeserialize(self, inctx) } @@ -386,7 +388,7 @@ impl<'a, Ctx: Context<'a>, F: QRegularFactory<'a, Ctx>> FactoryModeProxy<'a, Ctx { type F = F; - fn pmdeserialize>(f: &Self::F, inctx: I) -> ParseResultM<'a, Ctx, F, I> { + fn pmdeserialize>(f: &Self::F, inctx: I) -> ModeResultM<'a, Ctx, F, I> { f.qrdeserialize(inctx) } diff --git a/src/rstd/atomic/atomic_object.rs b/src/rstd/atomic/atomic_object.rs index a26727f..52b540f 100644 --- a/src/rstd/atomic/atomic_object.rs +++ b/src/rstd/atomic/atomic_object.rs @@ -80,7 +80,7 @@ impl ParseMode for AtomicFactory { } impl<'a, Ctx: Context<'a>, A: AtomicModeParse> FactoryModeParse<'a, Ctx> for AtomicFactory { - fn mdeserialize>(&self, inctx: I) -> ParseResultM<'a, Ctx, Self, I> { + fn mdeserialize>(&self, inctx: I) -> ModeResultM<'a, Ctx, Self, I> { A::ma_deserialize(inctx).map(|a| Self::map(a, From::from)) } diff --git a/src/rstd/inlining/modes.rs b/src/rstd/inlining/modes.rs index d78bee5..a529f43 100644 --- a/src/rstd/inlining/modes.rs +++ b/src/rstd/inlining/modes.rs @@ -71,7 +71,7 @@ impl<'a, Ctx: Context<'a>, F: QInliningFactory<'a, Ctx>> FactoryModeProxy<'a, Ct { type F = F; - fn pmdeserialize>(f: &Self::F, inctx: I) -> ParseResultM<'a, Ctx, F, I> { + fn pmdeserialize>(f: &Self::F, inctx: I) -> ModeResultM<'a, Ctx, F, I> { f.qideserialize(inctx) } diff --git a/src/rstd/inlining/static_pair.rs b/src/rstd/inlining/static_pair.rs index f20b008..a12bd0e 100644 --- a/src/rstd/inlining/static_pair.rs +++ b/src/rstd/inlining/static_pair.rs @@ -153,7 +153,7 @@ impl<'a, Ctx: Context<'a>, SP: StaticPair<'a, Ctx>> FactoryModeParse<'a, Ctx> where SP::FB: FactoryModeParse<'a, Ctx>, { - fn mdeserialize>(&self, inctx: I) -> ParseResultM<'a, Ctx, Self, I> { + fn mdeserialize>(&self, inctx: I) -> ModeResultM<'a, Ctx, Self, I> { let (fa, fb) = SP::factories(&self.factory_data); let (a, inctx) = fa .ideserialize(inctx)