From 72aa916fe7cd7138e89de61aadda051d0500b2c6 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Tue, 13 Jul 2021 07:19:41 +0100 Subject: [PATCH] reduce imports (#27) --- Cargo.toml | 4 +--- src/middleware.rs | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6e829986e..a5879076b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,9 +25,7 @@ opentelemetry_0_14 = ["opentelemetry_0_14_pkg", "tracing-opentelemetry_0_13_pkg" emit_event_on_error = [] [dependencies] -actix-web = "=4.0.0-beta.8" -actix-http = "=3.0.0-beta.8" -actix-service = "^2.0.0" +actix-web = { version = "=4.0.0-beta.8", default-features = false } tracing = "0.1.19" tracing-futures = "0.2.4" futures = "0.3.5" diff --git a/src/middleware.rs b/src/middleware.rs index 7a3926068..95b5a7df6 100644 --- a/src/middleware.rs +++ b/src/middleware.rs @@ -2,7 +2,6 @@ use crate::{DefaultRootSpanBuilder, RequestId, RootSpan, RootSpanBuilder}; use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform}; use actix_web::{Error, HttpMessage, ResponseError}; use futures::future::{ok, Ready}; -use futures::task::{Context, Poll}; use std::future::Future; use std::pin::Pin; use tracing::Span; @@ -125,9 +124,7 @@ where type Error = Error; type Future = Pin>>>; - fn poll_ready(&self, cx: &mut Context<'_>) -> Poll> { - self.service.poll_ready(cx) - } + actix_web::dev::forward_ready!(service); fn call(&self, req: ServiceRequest) -> Self::Future { req.extensions_mut().insert(RequestId::generate());