Update to 2024 edition

All of the changes outside of Cargo.toml are the result of running
`cargo fmt --all` to update to the 2024 edition's formatting style.

Author: nicholasbishop

Cargo.toml

@@ -11,7 +11,7 @@ members = ["fuzz", "sbat", "sbat-tool"]
 resolver = "2"
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/google/sbat-rs"
 rust-version = "1.85"

sbat-tool/src/main.rs

@@ -6,14 +6,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use ascii::AsciiStr;
 use clap::{Parser, Subcommand};
 use fs_err as fs;
 use itertools::Itertools;
 use object::{Object, ObjectSection};
 use sbat::{
-    ImageSbat, RevocationSbat, RevocationSection, REVOCATION_SECTION_NAME,
+    ImageSbat, REVOCATION_SECTION_NAME, RevocationSbat, RevocationSection,
     SBAT_SECTION_NAME,
 };
 use std::io::{self, Write};
@@ -237,26 +237,32 @@ mod tests {
     /// Test that a bad input path doesn't cause a panic.
     #[test]
     fn test_invalid_path() {
-        assert!(run_action(&Args {
-            action: Action::Dump {
-                section: SBAT_SECTION_NAME.into(),
-                input: "/bad/path".into(),
-            }
-        })
-        .is_err());
+        assert!(
+            run_action(&Args {
+                action: Action::Dump {
+                    section: SBAT_SECTION_NAME.into(),
+                    input: "/bad/path".into(),
+                }
+            })
+            .is_err()
+        );
 
-        assert!(run_action(&Args {
-            action: Action::Validate {
-                input: vec!["/bad/path".into()],
-            }
-        })
-        .is_err());
+        assert!(
+            run_action(&Args {
+                action: Action::Validate {
+                    input: vec!["/bad/path".into()],
+                }
+            })
+            .is_err()
+        );
 
-        assert!(run_action(&Args {
-            action: Action::ValidateRevocations {
-                input: vec!["/bad/path".into()],
-            }
-        })
-        .is_err());
+        assert!(
+            run_action(&Args {
+                action: Action::ValidateRevocations {
+                    input: vec!["/bad/path".into()],
+                }
+            })
+            .is_err()
+        );
     }
 }

sbat/src/image.rs

@@ -12,7 +12,7 @@
 //! executable. See the crate documentation for details of how it is
 //! used.
 
-use crate::csv::{trim_ascii_at_null, CsvIter, Record};
+use crate::csv::{CsvIter, Record, trim_ascii_at_null};
 use crate::{Component, ParseError};
 use ascii::AsciiStr;
 use core::ptr;

sbat/src/lib.rs

@@ -80,16 +80,16 @@ mod revocations;
 #[cfg(feature = "alloc")]
 mod alloc;
 
+pub use ValidationResult::{Allowed, Revoked};
 pub use component::Component;
 pub use csv::ALLOWED_SPECIAL_CHARS;
 pub use error::ParseError;
 pub use generation::Generation;
-pub use image::{Entries, Entry, ImageSbat, Vendor, SBAT_SECTION_NAME};
+pub use image::{Entries, Entry, ImageSbat, SBAT_SECTION_NAME, Vendor};
 pub use revocation_section::{
-    RevocationSection, RevocationSectionError, REVOCATION_SECTION_NAME,
+    REVOCATION_SECTION_NAME, RevocationSection, RevocationSectionError,
 };
 pub use revocations::{RevocationSbat, RevokedComponents, ValidationResult};
-pub use ValidationResult::{Allowed, Revoked};
 
 #[cfg(feature = "alloc")]
 pub use alloc::{ImageSbatOwned, RevocationSbatOwned};

sbat/src/revocations.rs

@@ -11,7 +11,7 @@
 //! Typically this data is read from a UEFI variable. See the crate
 //! documentation for details of how it is used.
 
-use crate::csv::{trim_ascii_at_null, CsvIter};
+use crate::csv::{CsvIter, trim_ascii_at_null};
 use crate::{Component, Entry, ImageSbat, ParseError};
 use ascii::AsciiStr;
 use core::ptr;