service trait takes request type parameter #232
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I'll wait on #229 so this PR is smaller. |
fakeshadow
approved these changes
Dec 27, 2020
| f: F, | ||
| ) -> FnServiceConfig<F, Fut, Cfg, Srv, Err> | ||
| ) -> FnServiceConfig<F, Fut, Cfg, Srv, Req, Err> |
There was a problem hiding this comment.
I believe FnServiceConfig<F, Fut, Cfg, Req> would be enough type. Srv and Err type are actuall associate types for Fut so they can be unconstraint.
Comment on lines
+243
to
251
| pub struct FnServiceConfig<F, Fut, Cfg, Srv, Req, Err> | ||
| where | ||
| F: Fn(Cfg) -> Fut, | ||
| Fut: Future<Output = Result<Srv, Err>>, | ||
| Srv: Service, | ||
| Srv: Service<Req>, | ||
| { | ||
| f: F, | ||
| _t: PhantomData<(Fut, Cfg, Srv, Err)>, | ||
| _t: PhantomData<(Fut, Cfg, Req, Srv, Err)>, | ||
| } |
There was a problem hiding this comment.
Like previous comment.
pub struct FnServiceConfig<F, Fut, Cfg, Req>
where
F: Fn(Cfg) -> Fut,
Fut: Future,
{
f: F,
_t: PhantomData<(Fut, Cfg, Req)>,
}| } | ||
|
|
||
| impl<F, Fut, Cfg, Srv, Err> FnServiceConfig<F, Fut, Cfg, Srv, Err> | ||
| impl<F, Fut, Cfg, Srv, Req, Err> FnServiceConfig<F, Fut, Cfg, Srv, Req, Err> |
There was a problem hiding this comment.
impl<F, Fut, Cfg, Srv, Req, Err> FnServiceConfig<F, Fut, Cfg, Req>
| { | ||
| fn new(f: F) -> Self { | ||
| FnServiceConfig { f, _t: PhantomData } | ||
| } | ||
| } | ||
|
|
||
| impl<F, Fut, Cfg, Srv, Err> Clone for FnServiceConfig<F, Fut, Cfg, Srv, Err> | ||
| impl<F, Fut, Cfg, Srv, Req, Err> Clone for FnServiceConfig<F, Fut, Cfg, Srv, Req, Err> |
There was a problem hiding this comment.
impl<F, Fut, Cfg, Srv, Req, Err> Clone for FnServiceConfig<F, Fut, Cfg, Req>
| @@ -275,13 +275,13 @@ where | |||
| } | |||
| } | |||
|
|
|||
| impl<F, Fut, Cfg, Srv, Err> ServiceFactory for FnServiceConfig<F, Fut, Cfg, Srv, Err> | |||
| impl<F, Fut, Cfg, Srv, Req, Err> ServiceFactory<Req> | |||
| for FnServiceConfig<F, Fut, Cfg, Srv, Req, Err> | |||
There was a problem hiding this comment.
impl<F, Fut, Cfg, Srv, Req, Err> ServiceFactory
for FnServiceConfig<F, Fut, Cfg, Req>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Type
Improvement
PR Checklist
Overview
It's advantageous to accept multiple request types for a given service. I believe this will simplify some of the complex types and handling in actix-web http1/http2 request dispatching.
Obviously massive breaking change to actix-service. Other breaking changes include:
actix-connect:
actix-server: