From 90dbac28654561296198989794e19e6720ceebb8 Mon Sep 17 00:00:00 2001 From: timofey Date: Wed, 28 Jun 2023 16:33:47 +0000 Subject: [PATCH] `Inlining` rename --- src/rstd/atomic/au64.rs | 2 +- src/rstd/atomic/boolean.rs | 2 +- src/rstd/inlining.rs | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/rstd/atomic/au64.rs b/src/rstd/atomic/au64.rs index 84ba8be..f8e602c 100644 --- a/src/rstd/atomic/au64.rs +++ b/src/rstd/atomic/au64.rs @@ -51,7 +51,7 @@ impl InlineableAtomic for u64 { IntParseError::ExtraData(tail.len()) } - fn a_ideserialize(deserializer: D) -> ADParseResult { + fn a_ideserialize(deserializer: D) -> ADParseResult { let (x, deserializer) = deserializer.iread_n_const::<8>(|slice| IntParseError::from(slice))?; Ok((u64::from_le_bytes(x), deserializer)) diff --git a/src/rstd/atomic/boolean.rs b/src/rstd/atomic/boolean.rs index bc06d6e..dba67df 100644 --- a/src/rstd/atomic/boolean.rs +++ b/src/rstd/atomic/boolean.rs @@ -63,7 +63,7 @@ impl InlineableAtomic for bool { BooleanParseError::ExtraData(tail.len()) } - fn a_ideserialize(deserializer: D) -> ADParseResult { + fn a_ideserialize(deserializer: D) -> ADParseResult { let (byte, deserializer) = deserializer.iread_n_const::<1>(|slice| BooleanParseError::from(slice))?; match byte[0] { diff --git a/src/rstd/inlining.rs b/src/rstd/inlining.rs index 4db2515..e190ad7 100644 --- a/src/rstd/inlining.rs +++ b/src/rstd/inlining.rs @@ -10,7 +10,7 @@ use super::{ *, }; -pub trait InlineableDeserializer: Sized { +pub trait Inlining: Sized { fn iread_n( self, n: usize, @@ -19,7 +19,7 @@ pub trait InlineableDeserializer: Sized { ) -> Result<(A, Self), E>; } -pub trait InlineableDeserializerExt: InlineableDeserializer { +pub trait InliningExt: Inlining { fn iread_n_const( self, err: impl FnOnce(&[u8]) -> E, @@ -28,9 +28,9 @@ pub trait InlineableDeserializerExt: InlineableDeserializer { } } -impl InlineableDeserializerExt for D {} +impl InliningExt for D {} -impl InlineableDeserializer for &mut D { +impl Inlining for &mut D { fn iread_n( self, n: usize, @@ -46,13 +46,13 @@ impl InlineableDeserializer for &mut D { } } -pub trait InlineableDeCtx<'a, Ctx: Context<'a>>: InlineableDeserializer {} +pub trait InCtx<'a, Ctx: Context<'a>>: Inlining {} -struct InlineableDeCtxT<'a: 'c, 'c, Ctx: Context<'a>> { +struct InCtxT<'a: 'c, 'c, Ctx: Context<'a>> { dectx: &'c mut dyn DeCtx<'a, Ctx>, } -impl<'a: 'c, 'c, Ctx: Context<'a>> InlineableDeserializer for InlineableDeCtxT<'a, 'c, Ctx> { +impl<'a: 'c, 'c, Ctx: Context<'a>> Inlining for InCtxT<'a, 'c, Ctx> { fn iread_n( self, n: usize, @@ -66,7 +66,7 @@ impl<'a: 'c, 'c, Ctx: Context<'a>> InlineableDeserializer for InlineableDeCtxT<' } } -impl<'a: 'c, 'c, Ctx: Context<'a>> InlineableDeCtx<'a, Ctx> for InlineableDeCtxT<'a, 'c, Ctx> {} +impl<'a: 'c, 'c, Ctx: Context<'a>> InCtx<'a, Ctx> for InCtxT<'a, 'c, Ctx> {} pub type IParseResult<'a, Ctx, F, I> = Result<(Mtbl<'a, Ctx, F>, I), >::ParseError>; @@ -109,7 +109,7 @@ pub type ADParseResult = Result<(A, D), ::AParseError>; pub trait InlineableAtomic: Atomic { fn a_extension_error(tail: &[u8]) -> Self::AParseError; - fn a_ideserialize(deserializer: D) -> ADParseResult; + fn a_ideserialize(deserializer: D) -> ADParseResult; } /// Atomic analogue of [`ConstSizeFactory`]/[`ConstSizeObject`].