diff --git a/src/encoding.rs b/src/encoding.rs index 0bce231..6a131cd 100644 --- a/src/encoding.rs +++ b/src/encoding.rs @@ -232,7 +232,7 @@ impl<'a> From> 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> for LabelEncoder<'a> { impl LabelEncoder<'_> { /// Encode a label. - pub fn encode_label_key(&mut self) -> Result { + pub fn encode_label_key(&mut self) -> Result, std::fmt::Error> { for_both_mut!( self, LabelEncoderInner, diff --git a/src/encoding/protobuf.rs b/src/encoding/protobuf.rs index b22ea5a..ae2ff60 100644 --- a/src/encoding/protobuf.rs +++ b/src/encoding/protobuf.rs @@ -72,7 +72,7 @@ pub(crate) struct DescriptorEncoder<'a> { impl DescriptorEncoder<'_> { pub(crate) fn new( metric_families: &mut Vec, - ) -> DescriptorEncoder { + ) -> DescriptorEncoder<'_> { DescriptorEncoder { metric_families, prefix: Default::default(), @@ -232,7 +232,7 @@ impl MetricEncoder<'_> { pub fn encode_family( &mut self, label_set: &S, - ) -> Result { + ) -> Result, 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 { + pub fn encode_label_key(&mut self) -> Result, std::fmt::Error> { self.labels.push(openmetrics_data_model::Label::default()); Ok(LabelKeyEncoder { diff --git a/src/encoding/text.rs b/src/encoding/text.rs index 6e090ba..ebb453a 100644 --- a/src/encoding/text.rs +++ b/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 { + pub fn encode_label_key(&mut self) -> Result, std::fmt::Error> { if !self.first { self.writer.write_str(",")?; } diff --git a/src/metrics/exemplar.rs b/src/metrics/exemplar.rs index e61f4d5..3dfa677 100644 --- a/src/metrics/exemplar.rs +++ b/src/metrics/exemplar.rs @@ -128,7 +128,7 @@ impl> CounterWithExemplar { /// Get the current value of the [`CounterWithExemplar`] as well as its /// [`Exemplar`] if any. - pub fn get(&self) -> (N, MappedRwLockReadGuard>>) { + pub fn get(&self) -> (N, MappedRwLockReadGuard<'_, Option>>) { let inner = self.inner.read(); let value = inner.counter.get(); let exemplar = RwLockReadGuard::map(inner, |inner| &inner.exemplar); @@ -143,7 +143,7 @@ impl> CounterWithExemplar { /// 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 { + pub fn inner(&self) -> MappedRwLockReadGuard<'_, A> { RwLockReadGuard::map(self.inner.read(), |inner| inner.counter.inner()) } } @@ -261,7 +261,7 @@ impl HistogramWithExemplars { } } - pub(crate) fn inner(&self) -> RwLockReadGuard> { + pub(crate) fn inner(&self) -> RwLockReadGuard<'_, HistogramWithExemplarsInner> { self.inner.read() } } diff --git a/src/metrics/family.rs b/src/metrics/family.rs index d3d55c6..1d0da87 100644 --- a/src/metrics/family.rs +++ b/src/metrics/family.rs @@ -263,7 +263,7 @@ impl> Family MappedRwLockReadGuard { + 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> Family Option> { + pub fn get(&self, label_set: &S) -> Option> { RwLockReadGuard::try_map(self.metrics.read(), |metrics| metrics.get(label_set)).ok() } @@ -341,7 +341,7 @@ impl> Family RwLockReadGuard> { + pub(crate) fn read(&self) -> RwLockReadGuard<'_, HashMap> { self.metrics.read() } } diff --git a/src/metrics/histogram.rs b/src/metrics/histogram.rs index 5a50278..1f5e4d9 100644 --- a/src/metrics/histogram.rs +++ b/src/metrics/histogram.rs @@ -106,7 +106,7 @@ impl Histogram { } } - pub(crate) fn get(&self) -> (f64, u64, MappedRwLockReadGuard>) { + pub(crate) fn get(&self) -> (f64, u64, MappedRwLockReadGuard<'_, Vec<(f64, u64)>>) { let inner = self.inner.read(); let sum = inner.sum; let count = inner.count;