diff --git a/src/rstd/atomic/array.rs b/src/rstd/atomic/array.rs index 6835caa..81f94a0 100644 --- a/src/rstd/atomic/array.rs +++ b/src/rstd/atomic/array.rs @@ -42,12 +42,12 @@ impl ImplMode for [u8; N] { type Mode = InliningMode; } -impl QInliningAtomic for [u8; N] { - fn qa_extension_error(tail: &[u8]) -> Self::AParseError { +impl CInliningAtomic for [u8; N] { + fn ca_extension_error(tail: &[u8]) -> Self::AParseError { ArrayParseError::ExtraData(tail.len()) } - fn qa_ideserialize(inlining: D) -> ADParseResult { + fn ca_ideserialize(inlining: D) -> ADParseResult { inlining.iread_n_const::(|slice| ArrayParseError::from(slice)) } } diff --git a/src/rstd/atomic/au64.rs b/src/rstd/atomic/au64.rs index 8a34e66..3caee64 100644 --- a/src/rstd/atomic/au64.rs +++ b/src/rstd/atomic/au64.rs @@ -42,12 +42,12 @@ impl ImplMode for u64 { type Mode = InliningMode; } -impl QInliningAtomic for u64 { - fn qa_extension_error(tail: &[u8]) -> Self::AParseError { +impl CInliningAtomic for u64 { + fn ca_extension_error(tail: &[u8]) -> Self::AParseError { IntParseError::ExtraData(tail.len()) } - fn qa_ideserialize(inlining: D) -> ADParseResult { + fn ca_ideserialize(inlining: D) -> ADParseResult { let (x, inlining) = inlining.iread_n_const::<8>(|slice| IntParseError::from(slice))?; Ok((u64::from_le_bytes(x), inlining)) } diff --git a/src/rstd/atomic/boolean.rs b/src/rstd/atomic/boolean.rs index 5fc6775..c7d9e82 100644 --- a/src/rstd/atomic/boolean.rs +++ b/src/rstd/atomic/boolean.rs @@ -49,12 +49,12 @@ impl ImplMode for bool { type Mode = InliningMode; } -impl QInliningAtomic for bool { - fn qa_extension_error(tail: &[u8]) -> Self::AParseError { +impl CInliningAtomic for bool { + fn ca_extension_error(tail: &[u8]) -> Self::AParseError { BooleanParseError::ExtraData(tail.len()) } - fn qa_ideserialize(inlining: D) -> ADParseResult { + fn ca_ideserialize(inlining: D) -> ADParseResult { let (byte, inlining) = inlining.iread_n_const::<1>(|slice| BooleanParseError::from(slice))?; match byte[0] { diff --git a/src/rstd/inlining.rs b/src/rstd/inlining.rs index fcc893a..ae9d05b 100644 --- a/src/rstd/inlining.rs +++ b/src/rstd/inlining.rs @@ -72,10 +72,10 @@ pub trait ConstSizeObject<'a, Ctx: Context<'a>>: FixedSizeObject<'a, Ctx> { pub type ADParseResult = Result<(A, D), AParseError>; -pub trait QInliningAtomic: AtomicBase + ImplMode { - fn qa_extension_error(tail: &[u8]) -> Self::AParseError; +pub trait CInliningAtomic: AtomicBase + ImplMode { + fn ca_extension_error(tail: &[u8]) -> Self::AParseError; - fn qa_ideserialize(inlining: D) -> ADParseResult; + fn ca_ideserialize(inlining: D) -> ADParseResult; } /// Atomic analogue of [`InliningFactory`]/[`InliningObject`]. diff --git a/src/rstd/inlining/modes.rs b/src/rstd/inlining/modes.rs index ac48de6..01314e6 100644 --- a/src/rstd/inlining/modes.rs +++ b/src/rstd/inlining/modes.rs @@ -84,14 +84,14 @@ impl<'a, Ctx: Context<'a>, F: CInliningFactory<'a, Ctx>> FactoryModeProxy<'a, Ct } } -impl AtomicModeProxy for WithMode { +impl AtomicModeProxy for WithMode { type A = A; fn pma_deserialize(inlining: I) -> AModeResultM { - A::qa_ideserialize(inlining) + A::ca_ideserialize(inlining) } fn pma_extend(_atomic: AExtensionSourceM, tail: &[u8]) -> AExtensionResultM { - A::qa_extension_error(tail) + A::ca_extension_error(tail) } }