tesaguri/twitter-client-rs - Change RPYFPVVK6EQGDFVCKLMCZUITZ3CP26X4PWCTM2BGTZQVDIAJKOFAC

`call` the `Service` immidiately instead of `oneshot`-ing

Created by tesaguri on January 19, 2021

RPYFPVVK6EQGDFVCKLMCZUITZ3CP26X4PWCTM2BGTZQVDIAJKOFAC

Dependencies

In channels

main

Change contents

Deletion in src/util.rs at line 6 [3.17]
B:BD[3.87] → [3.87:111]
```
pub trait Sealed<B> {}
```
File move: service.rs → traits.rs
BF:BFD[3.6] → [3.2025:2037]
[3.6]
[3.2038]

Replacement in src/traits.rs at line 1 [3.2038]

B:BD[3.2038] → [3.2039:2142]

//! A trait alias for [`Service`](tower_service::Service).
pub(crate) use self::private::IntoService;

[3.2038]

[3.2142]

//! Trait aliases for [`Future`] and [`Service`].

Insertion in src/traits.rs at line 4 [3.2038]
[3.2168]
[3.2168]
```
use std::pin::Pin;
```
Insertion in src/traits.rs at line 7 [3.2038]
[3.2201]
[3.2201]
```
use futures_core::TryFuture;
```
Replacement in src/traits.rs at line 12 [3.2038]
B:BD[3.2282] → [3.2282:2315]
```
use crate::util::{Seal, Sealed};
```
[3.2282]
[3.2315]
```
use crate::util::Seal;
```

Replacement in src/traits.rs at line 17 [3.2038]

B:BD[3.2443] → [3.2443:2651]

/// This is just an alias for [`tower_service::Service`](tower_service::Service)
/// introduced to reduce the number of type parameters in `Builder::listen_with_client`.
pub trait HttpService<B>: Sealed<B> {

[3.2443]

[3.2651]

/// This is just an alias for [`tower_service::Service`] introduced to reduce the number of type
/// parameters.
pub trait HttpService<B>: service_private::Sealed<B> {

Deletion in src/traits.rs at line 25 [3.2038]

B:BD[3.2834] → [3.2834:2952]

    #[doc(hidden)]
    fn _poll_ready(&mut self, cx: &mut Context<'_>, _seal: Seal) -> Poll<Result<(), Self::Error>>;

Insertion in src/traits.rs at line 27 [3.2038]
[3.3046]
[3.3046]
```
}
```

Insertion in src/traits.rs at line 29 [3.2038]

[3.3047]

/// An HTTP response future.
///
/// This is just an alias for [`Future`] introduced to reduce the number of type parameters.
pub trait HttpTryFuture: future_private::Sealed {
    type Body: Body;
    type Error;

Replacement in src/traits.rs at line 37 [3.2038]

B:BD[3.3066] → [3.3066:3190]

    fn _into_service(self, _seal: Seal) -> IntoService<Self>
    where
        Self: Sized,
    {
        IntoService(self)

[3.3066]

[3.3190]

    fn _try_poll(
        self: Pin<&mut Self>,
        cx: &mut Context<'_>,
        _seal: Seal,
    ) -> Poll<Result<Response<Self::Body>, Self::Error>>;
}
impl<F, B> HttpTryFuture for F
where
    F: TryFuture<Ok = Response<B>>,
    B: Body,
{
    type Body = B;
    type Error = F::Error;
    #[doc(hidden)]
    fn _try_poll(
        self: Pin<&mut Self>,
        cx: &mut Context<'_>,
        _seal: Seal,
    ) -> Poll<Result<Response<B>, F::Error>> {
        self.try_poll(cx)

Insertion in src/traits.rs at line 60 [3.2038]

[3.3196]

}
impl<F, B> future_private::Sealed for F
where
    F: TryFuture<Ok = Response<B>>,
    B: Body,
{

Deletion in src/traits.rs at line 79 [3.2038]

B:BD[3.3440] → [3.3440:3601]

    fn _poll_ready(&mut self, cx: &mut Context<'_>, _seal: Seal) -> Poll<Result<(), S::Error>> {
        Service::poll_ready(self, cx)
    }
    #[doc(hidden)]

Replacement in src/traits.rs at line 84 [3.2038]

B:BD[3.3723] → [3.3723:3762]

impl<S, ReqB, ResB> Sealed<ReqB> for S

[3.3723]

[3.3762]

impl<S, ReqB, ResB> service_private::Sealed<ReqB> for S

Replacement in src/traits.rs at line 91 [3.2038]

B:BD[3.3856] → [3.3856:4330]

impl<S, B> Service<Request<B>> for IntoService<S>
where
    S: HttpService<B>,
{
    type Response = Response<<S as HttpService<B>>::ResponseBody>;
    type Error = S::Error;
    type Future = S::Future;
    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), S::Error>> {
        HttpService::_poll_ready(&mut self.0, cx, Seal)
    }
    fn call(&mut self, request: Request<B>) -> Self::Future {
        HttpService::_call(&mut self.0, request, Seal)
    }

[3.3856]

[3.4330]

mod future_private {
    pub trait Sealed {}

Replacement in src/traits.rs at line 95 [3.2038]

B:BD[3.4333] → [3.4333:4385]

mod private {
    pub struct IntoService<S>(pub S);

[3.4333]

[3.4385]

mod service_private {
    pub trait Sealed<B> {}

Deletion in src/response.rs at line 13 [4.14]
B:BD[4.276] → [4.276:316]
```
use tower::util::{Oneshot, ServiceExt};
```

Replacement in src/response.rs at line 15 [4.14]

B:BD[4.370] → [4.370:418]

use crate::service::{HttpService, IntoService};

[4.370]

[4.418]

use crate::traits::{HttpService, HttpTryFuture};

Replacement in src/response.rs at line 26 [4.14]

B:BD[4.594] → [4.594:651]

    pub struct ResponseFuture<T, S: HttpService<B>, B> {

[4.594]

[4.651]

    pub struct ResponseFuture<T, F: HttpTryFuture> {

Replacement in src/response.rs at line 28 [4.14]

B:BD[4.666] → [4.666:708]

        inner: ResponseFutureInner<S, B>,

[4.666]

[4.708]

        inner: ResponseFutureInner<F>,

Replacement in src/response.rs at line 35 [4.14]

B:BD[4.813] → [2.19:83]

    pub(crate) enum ResponseFutureInner<S: HttpService<B>, B> {

[4.813]

[4.866]

    pub(crate) enum ResponseFutureInner<F: HttpTryFuture> {

Replacement in src/response.rs at line 38 [4.14]

B:BD[4.900] → [4.900:965]

            response: Oneshot<IntoService<S>, http::Request<B>>,

[4.900]

[4.965]

            response: F,

Replacement in src/response.rs at line 44 [4.14]

B:BD[4.1085] → [4.1085:1132]

            body: ConcatBody<S::ResponseBody>,

[4.1085]

[4.1132]

            body: ConcatBody<F::Body>,

Replacement in src/response.rs at line 57 [4.14]

B:BD[4.1262] → [4.1262:1417]

impl<T: de::DeserializeOwned, S, B> ResponseFuture<T, S, B>
where
    S: HttpService<B>,
{
    pub(crate) fn new(req: http::Request<B>, http: S) -> Self {

[4.1262]

[4.1417]

impl<T: de::DeserializeOwned, F: HttpTryFuture> ResponseFuture<T, F> {
    pub(crate) fn new<S, B>(req: http::Request<B>, http: &mut S) -> Self
    where
        S: HttpService<B, Future = F>,
    {

Replacement in src/response.rs at line 69 [4.14]

B:BD[4.1621] → [4.1621:1723]

impl<T: de::DeserializeOwned, S, B> Future for ResponseFuture<T, S, B>
where
    S: HttpService<B>,
{

[4.1621]

[4.1723]

impl<T: de::DeserializeOwned, F: HttpTryFuture> Future for ResponseFuture<T, F> {

Replacement in src/response.rs at line 71 [4.14]

B:BD[4.1761] → [4.1761:1851]

    type Output = Result<Response<T>, Error<S::Error, <S::ResponseBody as Body>::Error>>;

[4.1761]

[2.141]

    type Output = Result<Response<T>, Error<F::Error, <F::Body as Body>::Error>>;

Replacement in src/response.rs at line 83 [4.14]

B:BD[2.478] → [2.478:610]

impl<S, B> ResponseFutureInner<S, B>
where
    S: HttpService<B>,
{
    pub(crate) fn new(req: http::Request<B>, http: S) -> Self {

[2.478]

[2.610]

impl<F: HttpTryFuture> ResponseFutureInner<F> {
    pub(crate) fn new<S, B>(req: http::Request<B>, http: &mut S) -> Self
    where
        S: HttpService<B, Future = F>,
    {

Replacement in src/response.rs at line 89 [4.14]

B:BD[2.646] → [2.646:707]

            response: http._into_service(Seal).oneshot(req),

[2.646]

[2.707]

            response: http._call(req, Seal),

Replacement in src/response.rs at line 94 [4.14]

B:BD[2.726] → [2.726:805]

impl<S, B> Future for ResponseFutureInner<S, B>
where
    S: HttpService<B>,
{

[2.726]

[2.805]

impl<F: HttpTryFuture> Future for ResponseFutureInner<F> {

Replacement in src/response.rs at line 96 [4.14]

B:BD[2.843] → [2.843:937]

    type Output = Result<Response<Bytes>, Error<S::Error, <S::ResponseBody as Body>::Error>>;

[2.843]

[4.1851]

    type Output = Result<Response<Bytes>, Error<F::Error, <F::Body as Body>::Error>>;

Replacement in src/response.rs at line 100 [4.14]

∅:D[2.1024] → [4.2046:2120]

B:BD[4.2046] → [4.2046:2120]

            let res = ready!(response.poll(cx).map_err(Error::Service))?;

[2.1024]

[4.2120]

            let res = ready!(response._try_poll(cx, Seal).map_err(Error::Service))?;

Replacement in src/lib.rs at line 4 [3.4397]
∅:D[4.3729] → [3.4398:4415]
B:BD[3.4397] → [3.4398:4415]
```
pub mod service;
```
[4.3729]
[3.4415]
```
pub mod traits;
```
Replacement in src/lib.rs at line 16 [3.4397]
B:BD[4.3845] → [4.3845:3878]
```
use crate::service::HttpService;
```
[4.3845]
[3.5788]
```
use crate::traits::HttpService;
```

Replacement in src/lib.rs at line 35 [3.4397]

B:BD[3.6548] → [3.6548:6607]

        http: S,
    ) -> ResponseFuture<Self::Data, S, B>

[3.6548]

[3.6607]

        http: &mut S,
    ) -> ResponseFuture<Self::Data, S::Future>

Replacement in src/auth.rs at line 16 [4.7044]
∅:D[2.2383] → [4.7250:7283]
B:BD[4.7250] → [4.7250:7283]
```
use crate::service::HttpService;
```
[2.2383]
[4.7354]
```
use crate::traits::{HttpService, HttpTryFuture};
```

Replacement in src/auth.rs at line 24 [4.7044]

B:BD[2.2399] → [2.2399:2452]

    pub struct AuthFuture<T, S: HttpService<B>, B> {

[2.2399]

[2.2452]

    pub struct AuthFuture<T, F: HttpTryFuture> {

Replacement in src/auth.rs at line 26 [4.7044]

B:BD[2.2467] → [2.2467:2509]

        inner: ResponseFutureInner<S, B>,

[2.2467]

[2.2509]

        inner: ResponseFutureInner<F>,

Replacement in src/auth.rs at line 31 [4.7044]

B:BD[2.2558] → [2.2558:2709]

impl<T: de::DeserializeOwned, S, B> AuthFuture<T, S, B>
where
    S: HttpService<B>,
{
    pub(crate) fn new(req: http::Request<B>, http: S) -> Self {

[2.2558]

[2.2709]

impl<T: de::DeserializeOwned, F: HttpTryFuture> AuthFuture<T, F> {
    pub(crate) fn new<S, B>(req: http::Request<B>, http: &mut S) -> Self
    where
        S: HttpService<B, Future = F>,
    {

Replacement in src/auth.rs at line 43 [4.7044]

B:BD[2.2838] → [2.2838:2923]

impl<T: de::DeserializeOwned, S: HttpService<B>, B> Future for AuthFuture<T, S, B> {

[2.2838]

[2.2923]

impl<T: de::DeserializeOwned, F: HttpTryFuture> Future for AuthFuture<T, F> {

Replacement in src/auth.rs at line 45 [4.7044]

B:BD[2.2961] → [2.2961:3051]

    type Output = Result<Response<T>, Error<S::Error, <S::ResponseBody as Body>::Error>>;

[2.2961]

[2.3051]

    type Output = Result<Response<T>, Error<F::Error, <F::Body as Body>::Error>>;

Replacement in src/auth.rs at line 59 [4.7044]

B:BD[4.7561] → [4.7561:7576]

B:BD[4.7576] → [2.3424:3469]

    client: S,
) -> AuthFuture<Credentials<Box<str>>, S, B>

[4.7561]

[4.7672]

    client: &mut S,
) -> AuthFuture<Credentials<Box<str>>, S::Future>

Replacement in src/auth.rs at line 79 [4.7044]

B:BD[4.8531] → [2.3504:3535]

∅:D[2.3535] → [4.8568:8707]

B:BD[4.8568] → [4.8568:8707]

B:BD[4.8707] → [2.3536:3571]

pub fn access_token<'a, S, B>(
    oauth_verifier: &'a str,
    client_credentials: Credentials<&'a str>,
    temporary_credentials: Credentials<&'a str>,
    client: S,
) -> AuthFuture<AccessToken, S, B>

[4.8531]

[4.8793]

pub fn access_token<S, B>(
    oauth_verifier: &str,
    client_credentials: Credentials<&str>,
    temporary_credentials: Credentials<&str>,
    client: &mut S,
) -> AuthFuture<AccessToken, S::Future>

Deletion in Cargo.toml at line 28 [3.16232]
B:BD[3.16966] → [3.16966:17015]
```
tower = { version = "0.4", features = ["util"] }
```