Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

retry: Change Policy to accept &mut self #681

Merged
merged 10 commits into from
Aug 23, 2022
Merged

retry: Change Policy to accept &mut self #681

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a859b22
retry: Change `Policy` to accept `&mut self`
LucioFranco Aug 3, 2022
416e323
Remove `Unpin` requirement for policy
LucioFranco Aug 10, 2022
f028e65
Improve docs
LucioFranco Aug 12, 2022
c047a8c
Relax service bounds
LucioFranco Aug 12, 2022
c4f45be
Merge remote-tracking branch 'origin/master' into lucio/update-policy
LucioFranco Aug 12, 2022
a930936
Update doc tests for Budget
LucioFranco Aug 15, 2022
a12f517
Merge branch 'master' into lucio/update-policy
LucioFranco Aug 15, 2022
b98f538
Apply suggestions from code review
LucioFranco Aug 22, 2022
e679d5d
Rename Checking to Waiting
LucioFranco Aug 22, 2022
e0aa369
style
LucioFranco Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove Unpin requirement for policy
  • Loading branch information
@LucioFranco
LucioFranco committed Aug 10, 2022
commit 416e323024b0f7a21ca545ccee1915cf3c7bd034
4 changes: 2 additions & 2 deletions tower/src/retry/future.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ where

impl<P, S, Request> Future for ResponseFuture<P, S, Request>
where
P: Policy<Request, S::Response, S::Error> + Clone + Unpin,
P: Policy<Request, S::Response, S::Error> + Clone,
S: Service<Request> + Clone,
{
type Output = Result<S::Response, S::Error>;
Expand All @@ -76,7 +76,7 @@ where
StateProj::Called { future } => {
let mut result = ready!(future.poll(cx));
if let Some(req) = &mut this.request {
match this.retry.as_mut().project().policy.retry(req, &mut result) {
match this.retry.policy.retry(req, &mut result) {
Some(checking) => {
this.state.set(State::Checking { checking });
}
Expand Down
3 changes: 1 addition & 2 deletions tower/src/retry/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ pin_project! {
/// A [`Policy`] classifies what is a "failed" response.
#[derive(Clone, Debug)]
pub struct Retry<P, S> {
#[pin]
policy: P,
service: S,
}
Expand Down Expand Up @@ -51,7 +50,7 @@ impl<P, S> Retry<P, S> {

impl<P, S, Request> Service<Request> for Retry<P, S>
where
P: Policy<Request, S::Response, S::Error> + Clone + Unpin,
P: Policy<Request, S::Response, S::Error> + Clone,
S: Service<Request> + Clone,
{
type Response = S::Response;
Expand Down