From 673ab92662c404c440704408d279c1171d61c35c Mon Sep 17 00:00:00 2001 From: timofey Date: Mon, 19 Jun 2023 13:21:10 +0000 Subject: [PATCH] `ParseErrorA` --- src/rcore.rs | 2 ++ src/rcore/resolution.rs | 2 +- src/rstd/cast.rs | 2 +- src/rstd/collections/tree/context.rs | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/rcore.rs b/src/rcore.rs index d6d9565..b71484a 100644 --- a/src/rcore.rs +++ b/src/rcore.rs @@ -83,6 +83,8 @@ pub type Mtbl<'a, Ctx, F> = >::Mtbl; pub type ParseError<'a, Ctx, F> = >::ParseError; +pub type ParseErrorA<'a, Ctx, A> = ParseError<'a, Ctx, Fctr<'a, Ctx, A>>; + /// Extension trait for factories. pub trait ExtFactory<'a, Ctx: Context<'a>>: Factory<'a, Ctx> { /// Parse the object from a slice. diff --git a/src/rcore/resolution.rs b/src/rcore/resolution.rs index 7e26d50..e954ff2 100644 --- a/src/rcore/resolution.rs +++ b/src/rcore/resolution.rs @@ -20,7 +20,7 @@ impl ResolutionError { /// See [`ResolutionResult`]. pub type ResolutionFailure<'a, Ctx, A> = - ResolutionError<>::LookupError, ParseError<'a, Ctx, Fctr<'a, Ctx, A>>>; + ResolutionError<>::LookupError, ParseErrorA<'a, Ctx, A>>; /// Result yielded by [`Origin`]. pub type ResolutionResult<'a, Ctx, A> = Result, ResolutionFailure<'a, Ctx, A>>; diff --git a/src/rstd/cast.rs b/src/rstd/cast.rs index bffc711..ca77760 100644 --- a/src/rstd/cast.rs +++ b/src/rstd/cast.rs @@ -149,7 +149,7 @@ where } /// Returned by [`TypelessMentionable::cast`]. -pub type CastResult<'a, Ctx, A> = Result>>; +pub type CastResult<'a, Ctx, A> = Result>; impl<'a, Ctx: Context<'a>> TypelessMentionable<'a, Ctx> where diff --git a/src/rstd/collections/tree/context.rs b/src/rstd/collections/tree/context.rs index 6cd509b..e06ccab 100644 --- a/src/rstd/collections/tree/context.rs +++ b/src/rstd/collections/tree/context.rs @@ -39,7 +39,7 @@ impl<'a, Ctx: Context<'a>, A: Mentionable<'a, Ctx>, E: 'a> } } -type TreeParseError2<'a, Ctx, A> = TreeParseError>>; +type TreeParseError2<'a, Ctx, A> = TreeParseError>; impl<'a, Ctx: Context<'a>, A: Mentionable<'a, Ctx>, E: 'a> From> for TreeContextError<'a, Ctx, A, E>