Skip to content

Commit ec5b368

Browse files
committed
avoid temp var
1 parent bd845e2 commit ec5b368

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

opentelemetry/src/global/metrics.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,15 @@ pub fn set_meter_provider<P>(new_provider: P)
1919
where
2020
P: metrics::MeterProvider + Send + Sync + 'static,
2121
{
22-
let global_provider = global_meter_provider();
23-
let mut global_provider = global_provider
22+
let mut global_provider = global_meter_provider()
2423
.write()
2524
.expect("GLOBAL_METER_PROVIDER RwLock poisoned");
2625
*global_provider = Arc::new(new_provider);
2726
}
2827

2928
/// Returns an instance of the currently configured global [`MeterProvider`].
3029
pub fn meter_provider() -> GlobalMeterProvider {
31-
let global_provider = global_meter_provider();
32-
global_provider
30+
global_meter_provider()
3331
.read()
3432
.expect("GLOBAL_METER_PROVIDER RwLock poisoned")
3533
.clone()

opentelemetry/src/global/propagation.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ fn default_text_map_propagator() -> &'static NoopTextMapPropagator {
2323

2424
/// Sets the given [`TextMapPropagator`] propagator as the current global propagator.
2525
pub fn set_text_map_propagator<P: TextMapPropagator + Send + Sync + 'static>(propagator: P) {
26-
let global_propagator = global_text_map_propagator();
27-
let _lock = global_propagator
26+
let _lock = global_text_map_propagator()
2827
.write()
2928
.map(|mut global_propagator| *global_propagator = Box::new(propagator));
3029
}
@@ -34,8 +33,7 @@ pub fn get_text_map_propagator<T, F>(mut f: F) -> T
3433
where
3534
F: FnMut(&dyn TextMapPropagator) -> T,
3635
{
37-
let global_propagator = global_text_map_propagator();
38-
global_propagator
36+
global_text_map_propagator()
3937
.read()
4038
.map(|propagator| f(&**propagator))
4139
.unwrap_or_else(|_| {

opentelemetry/src/global/trace.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,7 @@ fn global_tracer_provider() -> &'static RwLock<GlobalTracerProvider> {
373373
/// [`TracerProvider`]: crate::trace::TracerProvider
374374
/// [`GlobalTracerProvider`]: crate::global::GlobalTracerProvider
375375
pub fn tracer_provider() -> GlobalTracerProvider {
376-
let global_provider = global_tracer_provider();
377-
global_provider
376+
global_tracer_provider()
378377
.read()
379378
.expect("GLOBAL_TRACER_PROVIDER RwLock poisoned")
380379
.clone()
@@ -430,8 +429,7 @@ where
430429
T: trace::Tracer<Span = S> + Send + Sync + 'static,
431430
P: trace::TracerProvider<Tracer = T> + Send + Sync + 'static,
432431
{
433-
let global_provider = global_tracer_provider();
434-
let mut tracer_provider = global_provider
432+
let mut tracer_provider = global_tracer_provider()
435433
.write()
436434
.expect("GLOBAL_TRACER_PROVIDER RwLock poisoned");
437435
mem::replace(
@@ -443,8 +441,7 @@ where
443441
/// Shut down the current tracer provider. This will invoke the shutdown method on all span processors.
444442
/// span processors should export remaining spans before return
445443
pub fn shutdown_tracer_provider() {
446-
let global_provider = global_tracer_provider();
447-
let mut tracer_provider = global_provider
444+
let mut tracer_provider = global_tracer_provider()
448445
.write()
449446
.expect("GLOBAL_TRACER_PROVIDER RwLock poisoned");
450447

0 commit comments

Comments
 (0)