Fix fmt warnings and update CI

TrustworthyComputing · Oct 3, 2024 · 140c68e · 140c68e
1 parent 848f6cc
commit 140c68e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -30,7 +30,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install nightly
-      run: rustup toolchain install nightly
+      run: rustup toolchain install 1.81.0
 
     - name: Install rustfmt
       run: rustup +nightly component add rustfmt

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -5,4 +5,4 @@ group_imports = "StdExternalCrate"
 imports_granularity = "Crate"
 merge_derives = false
 use_field_init_shorthand = true
-version = "Two"
+style_edition = "2021"
diff --git a/src/bin/server.rs b/src/bin/server.rs
@@ -207,11 +207,10 @@ impl Collector for CollectorServer {
         let mut coll = self.arc.lock().unwrap();
 
         for rejected_client_index in req.rejected {
-            debug_assert!(
-                coll.attribute_based_metrics_state
-                    .remove(&rejected_client_index)
-                    .is_some()
-            );
+            debug_assert!(coll
+                .attribute_based_metrics_state
+                .remove(&rejected_client_index)
+                .is_some());
         }
 
         let mut agg_share =