diff --git a/src/rstd/atomic.rs b/src/rstd/atomic.rs index 21f2fd9..ca55069 100644 --- a/src/rstd/atomic.rs +++ b/src/rstd/atomic.rs @@ -15,7 +15,7 @@ use crate::rcore::*; use super::*; pub use self::modes::{ - AExtensionResultM, AExtensionSourceM, AParseResultM, AtomicModeParse, AtomicModeProxy, + AExtensionResultM, AExtensionSourceM, AModeResultM, AtomicModeParse, AtomicModeProxy, RegularAtomic, }; diff --git a/src/rstd/atomic/modes.rs b/src/rstd/atomic/modes.rs index 32c2077..31e1f1e 100644 --- a/src/rstd/atomic/modes.rs +++ b/src/rstd/atomic/modes.rs @@ -10,14 +10,17 @@ impl Atomic for A { } } -pub type AParseResultM = ModeResultP, I>; +/// [`Atomic`] equivalent of [`ModeResult`]. +pub type AModeResultM = ModeResultP, I>; +/// [`Atomic`] equivalent of [`ExtensionResult`]. pub type AExtensionResultM = ExtensionResultP>; +/// [`Atomic`] equivalent of [`ExtensionSource`]. pub type AExtensionSourceM = ExtensionSourceP; pub trait AtomicModeParse: AtomicBase + ParseMode { - fn ma_deserialize(inlining: I) -> AParseResultM; + fn ma_deserialize(inlining: I) -> AModeResultM; fn ma_extend(atomic: AExtensionSourceM, tail: &[u8]) -> AExtensionResultM; } @@ -25,7 +28,7 @@ pub trait AtomicModeParse: AtomicBase + ParseMode { pub trait AtomicModeProxy { type A: AtomicBase + ParseMode; - fn pma_deserialize(inlining: I) -> AParseResultM; + fn pma_deserialize(inlining: I) -> AModeResultM; fn pma_extend(atomic: AExtensionSourceM, tail: &[u8]) -> AExtensionResultM; } @@ -34,7 +37,7 @@ impl AtomicModeParse for A where ::WithMode: AtomicModeProxy, { - fn ma_deserialize(inlining: I) -> AParseResultM { + fn ma_deserialize(inlining: I) -> AModeResultM { <::WithMode as AtomicModeProxy>::pma_deserialize(inlining) } @@ -51,7 +54,7 @@ pub trait RegularAtomic: AtomicBase + ParseMode { impl AtomicModeProxy for WithMode { type A = A; - fn pma_deserialize(inlining: I) -> AParseResultM { + fn pma_deserialize(inlining: I) -> AModeResultM { A::ra_deserialize(inlining) } diff --git a/src/rstd/inlining/modes.rs b/src/rstd/inlining/modes.rs index a529f43..6e8b32c 100644 --- a/src/rstd/inlining/modes.rs +++ b/src/rstd/inlining/modes.rs @@ -87,7 +87,7 @@ impl<'a, Ctx: Context<'a>, F: QInliningFactory<'a, Ctx>> FactoryModeProxy<'a, Ct impl AtomicModeProxy for WithMode { type A = A; - fn pma_deserialize(inlining: I) -> AParseResultM { + fn pma_deserialize(inlining: I) -> AModeResultM { A::qa_ideserialize(inlining) }