ci: bump MSRV to fix test jobs (#519)

lucab · web-flow · commit bf696d642c7e · 2024-05-03T18:34:36.000+02:00
* ci: bump MSRV to fix test jobs

Signed-off-by: Luca BRUNO &lt;lucab@lucabruno.net&gt;

* src: fix new linting warnings

Signed-off-by: Luca BRUNO &lt;lucab@lucabruno.net&gt;

---------

Signed-off-by: Luca BRUNO &lt;lucab@lucabruno.net&gt;
diff --git 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
@@ -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
@@ -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
@@ -300,7 +300,6 @@ impl<'a> MetricBuilderContext<'a> {
                         })#local_suffix_call,
                     }
                 } else {
-                    let prev_labels_ident = prev_labels_ident;
                     quote! {
                         #name: #member_type::from(
                             #(

Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,6 @@ impl<'a> MetricBuilderContext<'a> {`
`714`	`714`	`})#local_suffix_call,`
`715`	`715`	`}`
`716`	`716`	`} else {`
`717`		`- let prev_labels_ident = prev_labels_ident;`
`718`	`717`	`quote! {`
`719`	`718`	`#name: #member_type::from(`
`720`	`719`	`#(`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,6 @@ impl<'a> MetricBuilderContext<'a> {`
`300`	`300`	`})#local_suffix_call,`
`301`	`301`	`}`
`302`	`302`	`} else {`
`303`		`- let prev_labels_ident = prev_labels_ident;`
`304`	`303`	`quote! {`
`305`	`304`	`#name: #member_type::from(`
`306`	`305`	`#(`