Merge branch 'master' into impl-collector-for-arc

Author: hanabi1224

benches/encoding/proto.rs

@@ -47,20 +47,20 @@ pub fn proto(c: &mut Criterion) {
                 });
 
             registry.register(
-                format!("my_counter{}", i),
+                format!("my_counter{i}"),
                 "My counter",
                 counter_family.clone(),
             );
             registry.register(
-                format!("my_histogram{}", i),
+                format!("my_histogram{i}"),
                 "My histogram",
                 histogram_family.clone(),
             );
 
             for j in 0_u32..100 {
                 counter_family
                     .get_or_create(&CounterLabels {
-                        path: format!("/path/{}", i),
+                        path: format!("/path/{i}"),
                         method: Method::Get,
                         some_number: j.into(),
                     })

benches/encoding/text.rs

@@ -54,12 +54,12 @@ pub fn text(c: &mut Criterion) {
             });
 
             registry.register(
-                format!("my_counter_{}", i),
+                format!("my_counter_{i}"),
                 "My counter",
                 counter_family.clone(),
             );
             registry.register(
-                format!("my_histogram_{}", i),
+                format!("my_histogram_{i}"),
                 "My histogram",
                 histogram_family.clone(),
             );

examples/axum.rs

@@ -80,7 +80,7 @@ async fn main() {
         .route("/handler", get(some_handler))
         .with_state(metrics);
     let port = 8080;
-    let listener = tokio::net::TcpListener::bind(format!("0.0.0.0:{}", port))
+    let listener = tokio::net::TcpListener::bind(format!("0.0.0.0:{port}"))
         .await
         .unwrap();
 

examples/custom-metric.rs

@@ -41,5 +41,5 @@ fn main() {
     let mut encoded = String::new();
     encode(&mut encoded, &registry).unwrap();
 
-    println!("Scrape output:\n{:?}", encoded);
+    println!("Scrape output:\n{encoded:?}");
 }

examples/hyper.rs

@@ -76,7 +76,7 @@ pub fn make_handler(
         Box::pin(async move {
             let mut buf = String::new();
             encode(&mut buf, &reg.clone())
-                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
+                .map_err(std::io::Error::other)
                 .map(|_| {
                     let body = full(Bytes::from(buf));
                     Response::builder()

src/encoding.rs

@@ -232,7 +232,7 @@ impl<'a> From<protobuf::LabelSetEncoder<'a>> for LabelSetEncoder<'a> {
 
 impl LabelSetEncoder<'_> {
     /// Encode the given label.
-    pub fn encode_label(&mut self) -> LabelEncoder {
+    pub fn encode_label(&mut self) -> LabelEncoder<'_> {
         for_both_mut!(self, LabelSetEncoderInner, e, e.encode_label().into())
     }
 }
@@ -321,7 +321,7 @@ impl<'a> From<protobuf::LabelEncoder<'a>> for LabelEncoder<'a> {
 
 impl LabelEncoder<'_> {
     /// Encode a label.
-    pub fn encode_label_key(&mut self) -> Result<LabelKeyEncoder, std::fmt::Error> {
+    pub fn encode_label_key(&mut self) -> Result<LabelKeyEncoder<'_>, std::fmt::Error> {
         for_both_mut!(
             self,
             LabelEncoderInner,
@@ -415,6 +415,7 @@ impl EncodeLabelKey for Cow<'_, str> {
 
 impl<T> EncodeLabelKey for Box<T>
 where
+    T: ?Sized,
     for<'a> &'a T: EncodeLabelKey,
 {
     fn encode(&self, encoder: &mut LabelKeyEncoder) -> Result<(), std::fmt::Error> {
@@ -424,6 +425,7 @@ where
 
 impl<T> EncodeLabelKey for Arc<T>
 where
+    T: ?Sized,
     for<'a> &'a T: EncodeLabelKey,
 {
     fn encode(&self, encoder: &mut LabelKeyEncoder) -> Result<(), std::fmt::Error> {
@@ -433,6 +435,7 @@ where
 
 impl<T> EncodeLabelKey for Rc<T>
 where
+    T: ?Sized,
     for<'a> &'a T: EncodeLabelKey,
 {
     fn encode(&self, encoder: &mut LabelKeyEncoder) -> Result<(), std::fmt::Error> {
@@ -510,6 +513,7 @@ impl EncodeLabelValue for Cow<'_, str> {
 
 impl<T> EncodeLabelValue for Box<T>
 where
+    T: ?Sized,
     for<'a> &'a T: EncodeLabelValue,
 {
     fn encode(&self, encoder: &mut LabelValueEncoder) -> Result<(), std::fmt::Error> {
@@ -519,6 +523,7 @@ where
 
 impl<T> EncodeLabelValue for Arc<T>
 where
+    T: ?Sized,
     for<'a> &'a T: EncodeLabelValue,
 {
     fn encode(&self, encoder: &mut LabelValueEncoder) -> Result<(), std::fmt::Error> {
@@ -528,6 +533,7 @@ where
 
 impl<T> EncodeLabelValue for Rc<T>
 where
+    T: ?Sized,
     for<'a> &'a T: EncodeLabelValue,
 {
     fn encode(&self, encoder: &mut LabelValueEncoder) -> Result<(), std::fmt::Error> {

src/encoding/protobuf.rs

@@ -72,7 +72,7 @@ pub(crate) struct DescriptorEncoder<'a> {
 impl DescriptorEncoder<'_> {
     pub(crate) fn new(
         metric_families: &mut Vec<openmetrics_data_model::MetricFamily>,
-    ) -> DescriptorEncoder {
+    ) -> DescriptorEncoder<'_> {
         DescriptorEncoder {
             metric_families,
             prefix: Default::default(),
@@ -232,7 +232,7 @@ impl MetricEncoder<'_> {
     pub fn encode_family<S: EncodeLabelSet>(
         &mut self,
         label_set: &S,
-    ) -> Result<MetricEncoder, std::fmt::Error> {
+    ) -> Result<MetricEncoder<'_>, std::fmt::Error> {
         let mut labels = self.labels.clone();
         label_set.encode(
             &mut LabelSetEncoder {
@@ -382,7 +382,7 @@ pub(crate) struct LabelSetEncoder<'a> {
 }
 
 impl LabelSetEncoder<'_> {
-    pub fn encode_label(&mut self) -> LabelEncoder {
+    pub fn encode_label(&mut self) -> LabelEncoder<'_> {
         LabelEncoder {
             labels: self.labels,
         }
@@ -395,7 +395,7 @@ pub(crate) struct LabelEncoder<'a> {
 }
 
 impl LabelEncoder<'_> {
-    pub fn encode_label_key(&mut self) -> Result<LabelKeyEncoder, std::fmt::Error> {
+    pub fn encode_label_key(&mut self) -> Result<LabelKeyEncoder<'_>, std::fmt::Error> {
         self.labels.push(openmetrics_data_model::Label::default());
 
         Ok(LabelKeyEncoder {

src/encoding/text.rs

@@ -195,7 +195,7 @@ impl std::fmt::Debug for DescriptorEncoder<'_> {
 }
 
 impl DescriptorEncoder<'_> {
-    pub(crate) fn new(writer: &mut dyn Write) -> DescriptorEncoder {
+    pub(crate) fn new(writer: &mut dyn Write) -> DescriptorEncoder<'_> {
         DescriptorEncoder {
             writer,
             prefix: Default::default(),
@@ -643,7 +643,7 @@ impl<'a> LabelSetEncoder<'a> {
         }
     }
 
-    pub fn encode_label(&mut self) -> LabelEncoder {
+    pub fn encode_label(&mut self) -> LabelEncoder<'_> {
         let first = self.first;
         self.first = false;
         LabelEncoder {
@@ -667,7 +667,7 @@ impl std::fmt::Debug for LabelEncoder<'_> {
 }
 
 impl LabelEncoder<'_> {
-    pub fn encode_label_key(&mut self) -> Result<LabelKeyEncoder, std::fmt::Error> {
+    pub fn encode_label_key(&mut self) -> Result<LabelKeyEncoder<'_>, std::fmt::Error> {
         if !self.first {
             self.writer.write_str(",")?;
         }
@@ -1218,7 +1218,7 @@ mod tests {
     fn parse_with_python_client(input: String) {
         pyo3::prepare_freethreaded_python();
 
-        println!("{:?}", input);
+        println!("{input:?}");
         Python::with_gil(|py| {
             let parser = PyModule::from_code_bound(
                 py,

src/metrics/exemplar.rs

@@ -128,7 +128,7 @@ impl<S, N: Clone, A: counter::Atomic<N>> CounterWithExemplar<S, N, A> {
 
     /// Get the current value of the [`CounterWithExemplar`] as well as its
     /// [`Exemplar`] if any.
-    pub fn get(&self) -> (N, MappedRwLockReadGuard<Option<Exemplar<S, N>>>) {
+    pub fn get(&self) -> (N, MappedRwLockReadGuard<'_, Option<Exemplar<S, N>>>) {
         let inner = self.inner.read();
         let value = inner.counter.get();
         let exemplar = RwLockReadGuard::map(inner, |inner| &inner.exemplar);
@@ -143,7 +143,7 @@ impl<S, N: Clone, A: counter::Atomic<N>> CounterWithExemplar<S, N, A> {
     /// The caller of this function has to uphold the property of an Open
     /// Metrics counter namely that the value is monotonically increasing, i.e.
     /// either stays the same or increases.
-    pub fn inner(&self) -> MappedRwLockReadGuard<A> {
+    pub fn inner(&self) -> MappedRwLockReadGuard<'_, A> {
         RwLockReadGuard::map(self.inner.read(), |inner| inner.counter.inner())
     }
 }
@@ -261,7 +261,7 @@ impl<S> HistogramWithExemplars<S> {
         }
     }
 
-    pub(crate) fn inner(&self) -> RwLockReadGuard<HistogramWithExemplarsInner<S>> {
+    pub(crate) fn inner(&self) -> RwLockReadGuard<'_, HistogramWithExemplarsInner<S>> {
         self.inner.read()
     }
 }

src/metrics/family.rs

@@ -263,7 +263,7 @@ impl<S: Clone + std::hash::Hash + Eq, M, C: MetricConstructor<M>> Family<S, M, C
     /// NB: This method can cause deadlocks if multiple metrics within this family are read at
     /// once. Use [`Family::get_or_create_owned()`] if you would like to avoid this by cloning the
     /// metric `M`.
-    pub fn get_or_create(&self, label_set: &S) -> MappedRwLockReadGuard<M> {
+    pub fn get_or_create(&self, label_set: &S) -> MappedRwLockReadGuard<'_, M> {
         if let Some(metric) = self.get(label_set) {
             return metric;
         }
@@ -296,7 +296,7 @@ impl<S: Clone + std::hash::Hash + Eq, M, C: MetricConstructor<M>> Family<S, M, C
     ///     metric.inc();
     /// };
     /// ```
-    pub fn get(&self, label_set: &S) -> Option<MappedRwLockReadGuard<M>> {
+    pub fn get(&self, label_set: &S) -> Option<MappedRwLockReadGuard<'_, M>> {
         RwLockReadGuard::try_map(self.metrics.read(), |metrics| metrics.get(label_set)).ok()
     }
 
@@ -341,7 +341,7 @@ impl<S: Clone + std::hash::Hash + Eq, M, C: MetricConstructor<M>> Family<S, M, C
         self.metrics.write().clear()
     }
 
-    pub(crate) fn read(&self) -> RwLockReadGuard<HashMap<S, M>> {
+    pub(crate) fn read(&self) -> RwLockReadGuard<'_, HashMap<S, M>> {
         self.metrics.read()
     }
 }