actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-02-23 10:53:02 +01:00
Code Issues Releases Wiki Activity

Don't pull in unneeded dependency on futures (#35)

Browse Source
This commit is contained in:
Riley 2021-09-14 02:12:20 -05:00 committed by GitHub
parent 85ca23f7d2
commit 42ede27123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -30,7 +30,6 @@ emit_event_on_error = []
actix-web = { version = "=4.0.0-beta.9", default-features = false } actix-web = { version = "=4.0.0-beta.9", default-features = false }
tracing = "0.1.19" tracing = "0.1.19"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"
futures = "0.3.5"
uuid = { version = "0.8.1", features = ["v4"] } uuid = { version = "0.8.1", features = ["v4"] }
opentelemetry_0_13_pkg = { package = "opentelemetry", version = "0.13", optional = true } opentelemetry_0_13_pkg = { package = "opentelemetry", version = "0.13", optional = true }
opentelemetry_0_14_pkg = { package = "opentelemetry", version = "0.14", optional = true } opentelemetry_0_14_pkg = { package = "opentelemetry", version = "0.14", optional = true }

7
src/middleware.rs
View File

@ -1,8 +1,7 @@
use crate::{DefaultRootSpanBuilder, RequestId, RootSpan, RootSpanBuilder}; use crate::{DefaultRootSpanBuilder, RequestId, RootSpan, RootSpanBuilder};
use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform}; use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
use actix_web::{Error, HttpMessage, ResponseError}; use actix_web::{Error, HttpMessage, ResponseError};
use futures::future::{ok, Ready}; use std::future::{ready, Future, Ready};
use std::future::Future;
use std::pin::Pin; use std::pin::Pin;
use tracing::Span; use tracing::Span;
use tracing_futures::Instrument; use tracing_futures::Instrument;
@ -100,10 +99,10 @@ where
type Future = Ready<Result<Self::Transform, Self::InitError>>; type Future = Ready<Result<Self::Transform, Self::InitError>>;
fn new_transform(&self, service: S) -> Self::Future { fn new_transform(&self, service: S) -> Self::Future {
ok(TracingLoggerMiddleware { ready(Ok(TracingLoggerMiddleware {
service, service,
root_span_builder: std::marker::PhantomData::default(), root_span_builder: std::marker::PhantomData::default(),
}) }))
} }
} }