diff --git a/src/lib.rs b/src/lib.rs index 26020f7..e42fc68 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -157,12 +157,12 @@ impl ValidationContext { } } -/// Arguement store +/// # Arguments /// /// `T`: data type to validate /// `Self::A`: dependent arguments /// -pub trait ArgumentsStore<'a, T> { +pub trait Arguments<'a, T> { /// Argument type type A: 'a; /// Get dependent arguments @@ -269,23 +269,22 @@ where } #[async_trait] -impl FromRequest for ValidEx +impl FromRequest for ValidEx where State: Send + Sync, Body: Send + Sync + 'static, - Store: - Send + Sync + for<'a> ArgumentsStore<'a, >::ValidateArgs>, + Args: Send + Sync + for<'a> Arguments<'a, >::ValidateArgs>, Extractor: for<'v> HasValidateArgs<'v> + FromRequest, for<'v> >::ValidateArgs: ValidateArgs< 'v, - Args = >::ValidateArgs>>::A, + Args = >::ValidateArgs>>::A, >, - ValidationContext: FromRef, + ValidationContext: FromRef, { type Rejection = ValidRejection<>::Rejection>; async fn from_request(req: Request, state: &State) -> Result { - let ValidationContext { arguments }: ValidationContext = FromRef::from_ref(state); + let ValidationContext { arguments }: ValidationContext = FromRef::from_ref(state); let inner = Extractor::from_request(req, state) .await .map_err(ValidRejection::Inner)?; @@ -296,22 +295,21 @@ where } #[async_trait] -impl FromRequestParts for ValidEx +impl FromRequestParts for ValidEx where State: Send + Sync, - Store: - Send + Sync + for<'a> ArgumentsStore<'a, >::ValidateArgs>, + Args: Send + Sync + for<'a> Arguments<'a, >::ValidateArgs>, Extractor: for<'v> HasValidateArgs<'v> + FromRequestParts, for<'v> >::ValidateArgs: ValidateArgs< 'v, - Args = >::ValidateArgs>>::A, + Args = >::ValidateArgs>>::A, >, - ValidationContext: FromRef, + ValidationContext: FromRef, { type Rejection = ValidRejection<>::Rejection>; async fn from_request_parts(parts: &mut Parts, state: &State) -> Result { - let ValidationContext { arguments }: ValidationContext = FromRef::from_ref(state); + let ValidationContext { arguments }: ValidationContext = FromRef::from_ref(state); let inner = Extractor::from_request_parts(parts, state) .await .map_err(ValidRejection::Inner)?;