diff --git a/src/client/connector.rs b/src/client/connector.rs index 7778fe9b1..a160b8215 100644 --- a/src/client/connector.rs +++ b/src/client/connector.rs @@ -169,27 +169,27 @@ impl Handler for ClientConnector { // host name is required if uri.host().is_none() { - return Self::reply(Err(ClientConnectorError::InvalidUrl)) + return Response::reply(Err(ClientConnectorError::InvalidUrl)) } // supported protocols let proto = match uri.scheme_part() { Some(scheme) => match Protocol::from(scheme.as_str()) { Some(proto) => proto, - None => return Self::reply(Err(ClientConnectorError::InvalidUrl)), + None => return Response::reply(Err(ClientConnectorError::InvalidUrl)), }, - None => return Self::reply(Err(ClientConnectorError::InvalidUrl)), + None => return Response::reply(Err(ClientConnectorError::InvalidUrl)), }; // check ssl availability if proto.is_secure() && !HAS_OPENSSL { //&& !HAS_TLS { - return Self::reply(Err(ClientConnectorError::SslIsNotSupported)) + return Response::reply(Err(ClientConnectorError::SslIsNotSupported)) } let host = uri.host().unwrap().to_owned(); let port = uri.port().unwrap_or_else(|| proto.port()); - Self::async_reply( + Response::async_reply( Connector::from_registry() .call(self, ResolveConnect::host_and_port(&host, port)) .map_err(|_, _, _| ClientConnectorError::Disconnected) diff --git a/src/server/srv.rs b/src/server/srv.rs index 46e8c4318..ce0799d79 100644 --- a/src/server/srv.rs +++ b/src/server/srv.rs @@ -637,14 +637,14 @@ impl Handler for HttpServer } if !self.workers.is_empty() { - Self::async_reply( + Response::async_reply( rx.into_future().map(|_| ()).map_err(|_| ()).actfuture()) } else { // we need to stop system if server was spawned if self.exit { Arbiter::system().send(actix::msgs::SystemExit(0)) } - Self::reply(Ok(())) + Response::reply(Ok(())) } } } diff --git a/src/server/worker.rs b/src/server/worker.rs index 1daab36f8..183a70072 100644 --- a/src/server/worker.rs +++ b/src/server/worker.rs @@ -124,16 +124,16 @@ impl Handler for Worker let num = self.settings.num_channels(); if num == 0 { info!("Shutting down http worker, 0 connections"); - Self::reply(Ok(true)) + Response::reply(Ok(true)) } else if let Some(dur) = msg.graceful { info!("Graceful http worker shutdown, {} connections", num); let (tx, rx) = oneshot::channel(); self.shutdown_timeout(ctx, tx, dur); - Self::async_reply(rx.map_err(|_| ()).actfuture()) + Response::async_reply(rx.map_err(|_| ()).actfuture()) } else { info!("Force shutdown http worker, {} connections", num); self.settings.head().traverse::(); - Self::reply(Ok(false)) + Response::reply(Ok(false)) } } }