From 510f22efd23d36a17ef223ffba07baed95129442 Mon Sep 17 00:00:00 2001 From: timofey Date: Sat, 29 Jul 2023 14:37:19 +0000 Subject: [PATCH] `ParseFactory` -> `FactoryParse` --- src/rcore.rs | 4 ++-- src/rcore/addresses.rs | 4 ++-- src/rcore/modes.rs | 4 ++-- src/rcore/origin.rs | 2 +- src/rcore/resolver_origin.rs | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/rcore.rs b/src/rcore.rs index 98a0d79..f9fa830 100644 --- a/src/rcore.rs +++ b/src/rcore.rs @@ -101,7 +101,7 @@ pub trait FactoryBase<'a, Ctx: Context<'a>>: 'a + Send + Sync + Clone { type ParseError: 'a + Error; } -pub trait ParseFactory<'a, Ctx: Context<'a>>: FactoryBase<'a, Ctx> { +pub trait FactoryParse<'a, Ctx: Context<'a>>: FactoryBase<'a, Ctx> { /// See [`Deserializer`], [`Resolver`]. fn deserialize(&self, inctx: impl InCtx<'a, Ctx>) -> ParseResult<'a, Ctx, Self>; /// Called by finite stream parsers if there's any data left. @@ -111,7 +111,7 @@ pub trait ParseFactory<'a, Ctx: Context<'a>>: FactoryBase<'a, Ctx> { /// Trait representing deserialisation rules for [Mentionable]s. /// Crucial for [`crate::rstd::typeless`]. pub trait Factory<'a, Ctx: Context<'a>>: - ParseFactory<'a, Ctx, Mtbl = Self::_Mtbl> + ParseMode + FactoryParse<'a, Ctx, Mtbl = Self::_Mtbl> + ParseMode { type _Mtbl: MentionableBase<'a, Ctx, Fctr = Self> + MentionableTop<'a, Ctx>; } diff --git a/src/rcore/addresses.rs b/src/rcore/addresses.rs index 6389cd6..0256429 100644 --- a/src/rcore/addresses.rs +++ b/src/rcore/addresses.rs @@ -55,7 +55,7 @@ pub(super) trait InliningAddresses: Inlining { impl InliningAddresses for D {} -fn _parse_slice<'a, Ctx: Context<'a>, F: ParseFactory<'a, Ctx>>( +fn _parse_slice<'a, Ctx: Context<'a>, F: FactoryParse<'a, Ctx>>( factory: &F, slice: &[u8], resolver: &Rc>, @@ -74,7 +74,7 @@ fn _parse_slice<'a, Ctx: Context<'a>, F: ParseFactory<'a, Ctx>>( } } -impl<'a, Ctx: Context<'a>, F: ParseFactory<'a, Ctx>> FactoryExt<'a, Ctx> for F { +impl<'a, Ctx: Context<'a>, F: FactoryParse<'a, Ctx>> FactoryExt<'a, Ctx> for F { fn parse_slice( &self, slice: &[u8], diff --git a/src/rcore/modes.rs b/src/rcore/modes.rs index 2cb185a..6156134 100644 --- a/src/rcore/modes.rs +++ b/src/rcore/modes.rs @@ -27,7 +27,7 @@ pub trait FactoryProxy<'a, Ctx: Context<'a>> { ) -> ParseResult<'a, Ctx, Self::F>; } -impl<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx> + WithParseMode> ParseFactory<'a, Ctx> for F +impl<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx> + WithParseMode> FactoryParse<'a, Ctx> for F where F::WithMode: FactoryProxy<'a, Ctx, F = Self>, { @@ -40,7 +40,7 @@ where } } -impl<'a, Ctx: Context<'a>, F: ParseFactory<'a, Ctx> + WithParseMode> Factory<'a, Ctx> for F +impl<'a, Ctx: Context<'a>, F: FactoryParse<'a, Ctx> + WithParseMode> Factory<'a, Ctx> for F where F::Mtbl: MentionableTop<'a, Ctx>, { diff --git a/src/rcore/origin.rs b/src/rcore/origin.rs index faaa141..947340b 100644 --- a/src/rcore/origin.rs +++ b/src/rcore/origin.rs @@ -9,7 +9,7 @@ pub trait Origin<'a, Ctx: Context<'a>>: 'a { /// Try resolving the value. fn resolve(self: Rc) -> Resolution<'a, Ctx, Self::Mtbl> where - OFctr<'a, Ctx, Self>: ParseFactory<'a, Ctx>; + OFctr<'a, Ctx, Self>: FactoryParse<'a, Ctx>; /// Try resolving the bytes. Should avoid parsing the value. fn resolve_bytes(self: Rc) -> HashResolution<'a, Ctx>; } diff --git a/src/rcore/resolver_origin.rs b/src/rcore/resolver_origin.rs index de7c9e3..e83b4b6 100644 --- a/src/rcore/resolver_origin.rs +++ b/src/rcore/resolver_origin.rs @@ -27,7 +27,7 @@ struct ResolverOrigin<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx>> { r_resolver: Rc>, } -fn _resolve_origin<'a, Ctx: Context<'a>, F: ParseFactory<'a, Ctx>>( +fn _resolve_origin<'a, Ctx: Context<'a>, F: FactoryParse<'a, Ctx>>( origin: Rc>, ) -> Resolution<'a, Ctx, F::Mtbl> { origin @@ -52,7 +52,7 @@ impl<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx>> Origin<'a, Ctx> for Resolver fn resolve(self: Rc) -> Resolution<'a, Ctx, Self::Mtbl> where - F: ParseFactory<'a, Ctx>, + F: FactoryParse<'a, Ctx>, { _resolve_origin(self) }