Skip to content

Commit

Permalink
ci: bump MSRV to fix test jobs (#519)
Browse files Browse the repository at this point in the history
* ci: bump MSRV to fix test jobs

Signed-off-by: Luca BRUNO <lucab@lucabruno.net>

* src: fix new linting warnings

Signed-off-by: Luca BRUNO <lucab@lucabruno.net>

---------

Signed-off-by: Luca BRUNO <lucab@lucabruno.net>
  • Loading branch information
lucab authored May 3, 2024
1 parent b7e8745 commit bf696d6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
1 change: 0 additions & 1 deletion static-metric/src/auto_flush_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,6 @@ impl<'a> MetricBuilderContext<'a> {
})#local_suffix_call,
}
} else {
let prev_labels_ident = prev_labels_ident;
quote! {
#name: #member_type::from(
#(
Expand Down
1 change: 0 additions & 1 deletion static-metric/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ impl<'a> MetricBuilderContext<'a> {
})#local_suffix_call,
}
} else {
let prev_labels_ident = prev_labels_ident;
quote! {
#name: #member_type::from(
#(
Expand Down

0 comments on commit bf696d6

Please sign in to comment.