Skip to content

Commit b35dec4

Browse files
committed
cargo formatting
1 parent 716cee2 commit b35dec4

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
lines changed

opentelemetry/src/context/context_store.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
use crate::otel_warn;
32
#[cfg(feature = "trace")]
43
use crate::trace::context::SynchronizedSpan;

opentelemetry/src/context/future_ext.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use std::pin::Pin;
2-
use std::task::Poll;
1+
use crate::Context;
32
use futures_core::Stream;
43
use futures_sink::Sink;
54
use pin_project_lite::pin_project;
6-
use crate::Context;
5+
use std::pin::Pin;
76
use std::task::Context as TaskContext;
7+
use std::task::Poll;
88
impl<T: Sized> FutureExt for T {}
99

1010
impl<T: std::future::Future> std::future::Future for WithContext<T> {
@@ -78,8 +78,6 @@ where
7878
}
7979
}
8080

81-
82-
8381
/// Extension trait allowing futures, streams, and sinks to be traced with a span.
8482
pub trait FutureExt: Sized {
8583
/// Attaches the provided [`Context`] to this type, returning a `WithContext`

opentelemetry/src/trace/context.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ use crate::{
44
trace::{Span, SpanContext, Status},
55
Context, ContextGuard, KeyValue,
66
};
7-
use std::{
8-
borrow::Cow,
9-
error::Error,
10-
sync::Mutex,
11-
};
7+
use std::{borrow::Cow, error::Error, sync::Mutex};
128

139
// Re-export for compatability. This used to be contained here.
1410
pub use crate::context::FutureExt;
@@ -369,4 +365,3 @@ where
369365
{
370366
Context::map_current(|cx| f(cx.span()))
371367
}
372-

opentelemetry/src/trace/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,7 @@ mod tracer;
177177
mod tracer_provider;
178178

179179
pub use self::{
180-
context::{
181-
get_active_span, mark_span_as_active, FutureExt, SpanRef, TraceContextExt
182-
},
180+
context::{get_active_span, mark_span_as_active, FutureExt, SpanRef, TraceContextExt},
183181
span::{Span, SpanKind, Status},
184182
span_context::{SpanContext, TraceState},
185183
tracer::{SamplingDecision, SamplingResult, SpanBuilder, Tracer},

0 commit comments

Comments
 (0)