From bf696d642c7ede1c694f93f9b088371e30dd96ab Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 3 May 2024 18:34:36 +0200 Subject: [PATCH] ci: bump MSRV to fix test jobs (#519) * ci: bump MSRV to fix test jobs Signed-off-by: Luca BRUNO * src: fix new linting warnings Signed-off-by: Luca BRUNO --------- Signed-off-by: Luca BRUNO --- .github/workflows/rust.yml | 4 ++-- src/registry.rs | 4 ++-- static-metric/src/auto_flush_builder.rs | 1 - static-metric/src/builder.rs | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 27de644f..5a09984e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -9,9 +9,9 @@ on: env: CARGO_TERM_COLOR: always # Pinned toolchain for linting and benchmarks - ACTIONS_LINTS_TOOLCHAIN: 1.70.0 + ACTIONS_LINTS_TOOLCHAIN: 1.78.0 # Minimum supported Rust version (MSRV) - ACTION_MSRV_TOOLCHAIN: 1.70.0 + ACTION_MSRV_TOOLCHAIN: 1.74.0 EXTRA_FEATURES: "protobuf push process" jobs: diff --git a/src/registry.rs b/src/registry.rs index a4be61f1..4d07d4bb 100644 --- a/src/registry.rs +++ b/src/registry.rs @@ -183,8 +183,8 @@ impl RegistryCore { // Write out MetricFamilies sorted by their name. mf_by_name - .into_iter() - .map(|(_, mut m)| { + .into_values() + .map(|mut m| { // Add registry namespace prefix, if any. if let Some(ref namespace) = self.prefix { let prefixed = format!("{}_{}", namespace, m.get_name()); diff --git a/static-metric/src/auto_flush_builder.rs b/static-metric/src/auto_flush_builder.rs index bb0454ca..efb25394 100644 --- a/static-metric/src/auto_flush_builder.rs +++ b/static-metric/src/auto_flush_builder.rs @@ -714,7 +714,6 @@ impl<'a> MetricBuilderContext<'a> { })#local_suffix_call, } } else { - let prev_labels_ident = prev_labels_ident; quote! { #name: #member_type::from( #( diff --git a/static-metric/src/builder.rs b/static-metric/src/builder.rs index 680c416c..37fa614a 100644 --- a/static-metric/src/builder.rs +++ b/static-metric/src/builder.rs @@ -300,7 +300,6 @@ impl<'a> MetricBuilderContext<'a> { })#local_suffix_call, } } else { - let prev_labels_ident = prev_labels_ident; quote! { #name: #member_type::from( #(