From 42ede27123ccb44205ab9f91b90fcd9705a35585 Mon Sep 17 00:00:00 2001 From: Riley Date: Tue, 14 Sep 2021 02:12:20 -0500 Subject: [PATCH] Don't pull in unneeded dependency on futures (#35) --- Cargo.toml | 1 - src/middleware.rs | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 17913d48f..d918cc660 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,6 @@ emit_event_on_error = [] actix-web = { version = "=4.0.0-beta.9", default-features = false } tracing = "0.1.19" tracing-futures = "0.2.4" -futures = "0.3.5" uuid = { version = "0.8.1", features = ["v4"] } opentelemetry_0_13_pkg = { package = "opentelemetry", version = "0.13", optional = true } opentelemetry_0_14_pkg = { package = "opentelemetry", version = "0.14", optional = true } diff --git a/src/middleware.rs b/src/middleware.rs index ad8953e22..9096f8bba 100644 --- a/src/middleware.rs +++ b/src/middleware.rs @@ -1,8 +1,7 @@ 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 std::future::Future; +use std::future::{ready, Future, Ready}; use std::pin::Pin; use tracing::Span; use tracing_futures::Instrument; @@ -100,10 +99,10 @@ where type Future = Ready>; fn new_transform(&self, service: S) -> Self::Future { - ok(TracingLoggerMiddleware { + ready(Ok(TracingLoggerMiddleware { service, root_span_builder: std::marker::PhantomData::default(), - }) + })) } }