cargo fmt

pgxn/neon/communicator/src/file_cache.rs

@@ -14,10 +14,10 @@ use std::path::Path;
 use std::sync::Arc;
 use std::sync::Mutex;
 
-use measured::{Gauge, MetricGroup};
-use measured::metric::gauge::GaugeState;
-use measured::metric::MetricEncoding;
 use measured::metric;
+use measured::metric::MetricEncoding;
+use measured::metric::gauge::GaugeState;
+use measured::{Gauge, MetricGroup};
 
 use crate::BLCKSZ;
 
@@ -136,7 +136,7 @@ impl FileCache {
     }
 }
 
-impl <T: metric::group::Encoding> MetricGroup<T> for FileCache
+impl<T: metric::group::Encoding> MetricGroup<T> for FileCache
 where
     GaugeState: MetricEncoding<T>,
 {

pgxn/neon/communicator/src/global_allocator.rs

@@ -18,10 +18,10 @@
 use std::alloc::{GlobalAlloc, Layout, System};
 use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
 
-use measured::{Gauge, MetricGroup};
-use measured::metric::gauge::GaugeState;
-use measured::metric::MetricEncoding;
 use measured::metric;
+use measured::metric::MetricEncoding;
+use measured::metric::gauge::GaugeState;
+use measured::{Gauge, MetricGroup};
 
 pub(crate) struct MyAllocator {
     allocations: AtomicU64,
@@ -83,19 +83,24 @@ impl MyAllocatorCollector {
     }
 }
 
-impl <T: metric::group::Encoding> MetricGroup<T> for MyAllocatorCollector
+impl<T: metric::group::Encoding> MetricGroup<T> for MyAllocatorCollector
 where
     GaugeState: MetricEncoding<T>,
 {
     fn collect_group_into(&self, enc: &mut T) -> Result<(), <T as metric::group::Encoding>::Err> {
         // Update the gauges with fresh values first
-        self.metrics.communicator_mem_allocations
+        self.metrics
+            .communicator_mem_allocations
             .set(GLOBAL.allocations.load(Ordering::Relaxed) as i64);
-        self.metrics.communicator_mem_deallocations
+        self.metrics
+            .communicator_mem_deallocations
             .set(GLOBAL.allocations.load(Ordering::Relaxed) as i64);
-        self.metrics.communicator_mem_allocated
+        self.metrics
+            .communicator_mem_allocated
             .set(GLOBAL.allocated.load(Ordering::Relaxed) as i64);
-        self.metrics.communicator_mem_high.set(GLOBAL.high.load(Ordering::Relaxed) as i64);
+        self.metrics
+            .communicator_mem_high
+            .set(GLOBAL.high.load(Ordering::Relaxed) as i64);
 
         self.metrics.collect_group_into(enc)
     }

pgxn/neon/communicator/src/integrated_cache.rs

@@ -32,11 +32,11 @@ use crate::file_cache::{CacheBlock, FileCache};
 use crate::init::alloc_from_slice;
 use pageserver_page_api::RelTag;
 
-use measured::{Counter, Gauge, MetricGroup};
+use measured::metric;
+use measured::metric::MetricEncoding;
 use measured::metric::counter::CounterState;
 use measured::metric::gauge::GaugeState;
-use measured::metric::MetricEncoding;
-use measured::metric;
+use measured::{Counter, Gauge, MetricGroup};
 
 use neon_shmem::hash::{HashMapInit, entry::Entry};
 use neon_shmem::shmem::ShmemHandle;
@@ -85,7 +85,6 @@ struct IntegratedCacheMetricGroup {
     clock_iterations_counter: Counter,
 
     // metrics from the hash map
-
     /// Allocated size of the block cache hash map
     block_map_num_buckets: Gauge,
 
@@ -775,20 +774,24 @@ impl<'t> IntegratedCacheWriteAccess<'t> {
     }
 }
 
-impl <T: metric::group::Encoding> MetricGroup<T> for IntegratedCacheWriteAccess<'_>
+impl<T: metric::group::Encoding> MetricGroup<T> for IntegratedCacheWriteAccess<'_>
 where
     CounterState: MetricEncoding<T>,
     GaugeState: MetricEncoding<T>,
 {
     fn collect_group_into(&self, enc: &mut T) -> Result<(), <T as metric::group::Encoding>::Err> {
         // Update gauges
-        self.metrics.block_map_num_buckets
+        self.metrics
+            .block_map_num_buckets
             .set(self.block_map.get_num_buckets() as i64);
-        self.metrics.block_map_num_buckets_in_use
+        self.metrics
+            .block_map_num_buckets_in_use
             .set(self.block_map.get_num_buckets_in_use() as i64);
-        self.metrics.relsize_cache_num_buckets
+        self.metrics
+            .relsize_cache_num_buckets
             .set(self.relsize_cache.get_num_buckets() as i64);
-        self.metrics.relsize_cache_num_buckets_in_use
+        self.metrics
+            .relsize_cache_num_buckets_in_use
             .set(self.relsize_cache.get_num_buckets_in_use() as i64);
 
         if let Some(file_cache) = &self.file_cache {