Inlining rename

This commit is contained in:
AF 2023-06-28 16:33:47 +00:00
parent c48dee1fe3
commit 90dbac2865
3 changed files with 11 additions and 11 deletions

View File

@ -51,7 +51,7 @@ impl InlineableAtomic for u64 {
IntParseError::ExtraData(tail.len()) IntParseError::ExtraData(tail.len())
} }
fn a_ideserialize<D: InlineableDeserializer>(deserializer: D) -> ADParseResult<Self, D> { fn a_ideserialize<D: Inlining>(deserializer: D) -> ADParseResult<Self, D> {
let (x, deserializer) = let (x, deserializer) =
deserializer.iread_n_const::<8>(|slice| IntParseError::from(slice))?; deserializer.iread_n_const::<8>(|slice| IntParseError::from(slice))?;
Ok((u64::from_le_bytes(x), deserializer)) Ok((u64::from_le_bytes(x), deserializer))

View File

@ -63,7 +63,7 @@ impl InlineableAtomic for bool {
BooleanParseError::ExtraData(tail.len()) BooleanParseError::ExtraData(tail.len())
} }
fn a_ideserialize<D: InlineableDeserializer>(deserializer: D) -> ADParseResult<Self, D> { fn a_ideserialize<D: Inlining>(deserializer: D) -> ADParseResult<Self, D> {
let (byte, deserializer) = let (byte, deserializer) =
deserializer.iread_n_const::<1>(|slice| BooleanParseError::from(slice))?; deserializer.iread_n_const::<1>(|slice| BooleanParseError::from(slice))?;
match byte[0] { match byte[0] {

View File

@ -10,7 +10,7 @@ use super::{
*, *,
}; };
pub trait InlineableDeserializer: Sized { pub trait Inlining: Sized {
fn iread_n<A, E>( fn iread_n<A, E>(
self, self,
n: usize, n: usize,
@ -19,7 +19,7 @@ pub trait InlineableDeserializer: Sized {
) -> Result<(A, Self), E>; ) -> Result<(A, Self), E>;
} }
pub trait InlineableDeserializerExt<E>: InlineableDeserializer { pub trait InliningExt<E>: Inlining {
fn iread_n_const<const N: usize>( fn iread_n_const<const N: usize>(
self, self,
err: impl FnOnce(&[u8]) -> E, err: impl FnOnce(&[u8]) -> E,
@ -28,9 +28,9 @@ pub trait InlineableDeserializerExt<E>: InlineableDeserializer {
} }
} }
impl<D: InlineableDeserializer, E> InlineableDeserializerExt<E> for D {} impl<D: Inlining, E> InliningExt<E> for D {}
impl<D: ?Sized + Deserializer> InlineableDeserializer for &mut D { impl<D: ?Sized + Deserializer> Inlining for &mut D {
fn iread_n<A, E>( fn iread_n<A, E>(
self, self,
n: usize, n: usize,
@ -46,13 +46,13 @@ impl<D: ?Sized + Deserializer> 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>, 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<A, E>( fn iread_n<A, E>(
self, self,
n: usize, 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> = pub type IParseResult<'a, Ctx, F, I> =
Result<(Mtbl<'a, Ctx, F>, I), <F as Factory<'a, Ctx>>::ParseError>; Result<(Mtbl<'a, Ctx, F>, I), <F as Factory<'a, Ctx>>::ParseError>;
@ -109,7 +109,7 @@ pub type ADParseResult<A, D> = Result<(A, D), <A as Atomic>::AParseError>;
pub trait InlineableAtomic: Atomic { pub trait InlineableAtomic: Atomic {
fn a_extension_error(tail: &[u8]) -> Self::AParseError; fn a_extension_error(tail: &[u8]) -> Self::AParseError;
fn a_ideserialize<D: InlineableDeserializer>(deserializer: D) -> ADParseResult<Self, D>; fn a_ideserialize<D: Inlining>(deserializer: D) -> ADParseResult<Self, D>;
} }
/// Atomic analogue of [`ConstSizeFactory`]/[`ConstSizeObject`]. /// Atomic analogue of [`ConstSizeFactory`]/[`ConstSizeObject`].