diff --git a/src/agent.rs b/src/agent.rs index ee6ba05b..b969573b 100644 --- a/src/agent.rs +++ b/src/agent.rs @@ -9,7 +9,6 @@ use crate::config::RequestLevelConfig; use crate::middleware::MiddlewareNext; use crate::pool::ConnectionPool; use crate::resolver::{DefaultResolver, Resolver}; -use crate::run::run; use crate::send_body::AsSendBody; use crate::transport::{Connector, DefaultConnector}; use crate::{Config, Error, RequestBuilder, SendBody}; @@ -133,10 +132,10 @@ impl Agent { let body = body.as_body(); let request = Request::from_parts(parts, ()); - self.do_run(request, body) + self.run_via_middleware(request, body) } - pub(crate) fn run_middleware( + pub(crate) fn run_via_middleware( &self, request: Request<()>, body: SendBody, @@ -148,14 +147,6 @@ impl Agent { next.handle(request) } - pub(crate) fn do_run( - &self, - request: Request<()>, - body: SendBody, - ) -> Result, Error> { - run(self, request, body) - } - /// Get the config for this agent. pub fn config(&self) -> &Config { &self.config diff --git a/src/middleware.rs b/src/middleware.rs index 3c9fa4ae..afc42875 100644 --- a/src/middleware.rs +++ b/src/middleware.rs @@ -3,6 +3,7 @@ use std::fmt; use std::sync::Arc; +use crate::run::run; use crate::{Agent, Body, Error, SendBody}; /// Chained processing of request (and response). @@ -212,7 +213,7 @@ impl<'a> MiddlewareNext<'a> { // When chain is over, call the actual do_run on agent. let (parts, body) = request.into_parts(); let request = http::Request::from_parts(parts, ()); - self.agent.do_run(request, body) + run(self.agent, request, body) } } } diff --git a/src/request.rs b/src/request.rs index 22240c57..c67331cf 100644 --- a/src/request.rs +++ b/src/request.rs @@ -290,7 +290,7 @@ impl RequestBuilder { } fn do_call(agent: Agent, request: Request<()>, body: SendBody) -> Result, Error> { - let response = agent.run_middleware(request, body)?; + let response = agent.run_via_middleware(request, body)?; Ok(response) }