remove import reordering

Signed-off-by: Benjamin Coenen <[email protected]>

Author: bnjjj

opentelemetry-sdk/src/metrics/internal/aggregate.rs

@@ -1,20 +1,20 @@
-use std::marker;
-use std::sync::atomic::AtomicU64;
-use std::sync::Arc;
+use std::{marker, sync::Arc, sync::atomic::AtomicU64};
 
 use once_cell::sync::Lazy;
 use opentelemetry::KeyValue;
 
-use super::exponential_histogram::ExpoHistogram;
-use super::histogram::Histogram;
-use super::last_value::LastValue;
-use super::sum::PrecomputedSum;
-use super::sum::Sum;
-use super::Number;
-use crate::metrics::data::Aggregation;
-use crate::metrics::data::Gauge;
-use crate::metrics::data::Temporality;
-use crate::metrics::AttributeSet;
+use crate::{
+    metrics::data::{Aggregation, Gauge, Temporality},
+    metrics::AttributeSet,
+};
+
+use super::{
+    exponential_histogram::ExpoHistogram,
+    histogram::Histogram,
+    last_value::LastValue,
+    sum::{PrecomputedSum, Sum},
+    Number,
+};
 
 static STREAM_CARDINALITY_LIMIT: AtomicU64 = AtomicU64::new(2000);
 pub(crate) static STREAM_OVERFLOW_ATTRIBUTE_SET: Lazy<AttributeSet> = Lazy::new(|| {
@@ -218,17 +218,13 @@ impl<T: Number<T>> AggregateBuilder<T> {
 
 #[cfg(test)]
 mod tests {
-    use std::time::SystemTime;
-    use std::vec;
+    use crate::metrics::data::{
+        DataPoint, ExponentialBucket, ExponentialHistogram, ExponentialHistogramDataPoint,
+        Histogram, HistogramDataPoint, Sum,
+    };
+    use std::{time::SystemTime, vec};
 
     use super::*;
-    use crate::metrics::data::DataPoint;
-    use crate::metrics::data::ExponentialBucket;
-    use crate::metrics::data::ExponentialHistogram;
-    use crate::metrics::data::ExponentialHistogramDataPoint;
-    use crate::metrics::data::Histogram;
-    use crate::metrics::data::HistogramDataPoint;
-    use crate::metrics::data::Sum;
 
     #[test]
     fn last_value_aggregation() {

opentelemetry-sdk/src/metrics/internal/mod.rs

@@ -5,20 +5,14 @@ mod last_value;
 mod sum;
 
 use core::fmt;
-use std::ops::Add;
-use std::ops::AddAssign;
-use std::ops::Sub;
-use std::sync::atomic::AtomicI64;
-use std::sync::atomic::AtomicU64;
-use std::sync::atomic::Ordering;
+use std::ops::{Add, AddAssign, Sub};
+use std::sync::atomic::{AtomicI64, AtomicU64, Ordering};
 use std::sync::Mutex;
 
 pub use aggregate::set_stream_cardinality_limit;
-pub(crate) use aggregate::AggregateBuilder;
-pub(crate) use aggregate::ComputeAggregation;
-pub(crate) use aggregate::Measure;
-pub(crate) use exponential_histogram::EXPO_MAX_SCALE;
-pub(crate) use exponential_histogram::EXPO_MIN_SCALE;
+
+pub(crate) use aggregate::{AggregateBuilder, ComputeAggregation, Measure};
+pub(crate) use exponential_histogram::{EXPO_MAX_SCALE, EXPO_MIN_SCALE};
 
 /// Marks a type that can have a value added and retrieved atomically. Required since
 /// different types have different backing atomic mechanisms

opentelemetry-sdk/src/metrics/mod.rs

@@ -52,24 +52,22 @@ pub(crate) mod pipeline;
 pub mod reader;
 pub(crate) mod view;
 
-use std::collections::hash_map::DefaultHasher;
-use std::collections::HashSet;
-use std::hash::Hash;
-use std::hash::Hasher;
-
 pub use aggregation::*;
 pub use instrument::*;
 pub use internal::set_stream_cardinality_limit;
 pub use manual_reader::*;
 pub use meter::*;
 pub use meter_provider::*;
-use opentelemetry::Key;
-use opentelemetry::KeyValue;
-use opentelemetry::Value;
 pub use periodic_reader::*;
 pub use pipeline::Pipeline;
 pub use view::*;
 
+use std::collections::hash_map::DefaultHasher;
+use std::collections::HashSet;
+use std::hash::{Hash, Hasher};
+
+use opentelemetry::{Key, KeyValue, Value};
+
 /// A unique set of attributes that can be used as instrument identifiers.
 ///
 /// This must implement [Hash], [PartialEq], and [Eq] so it may be used as