Update to 2024 edition

Author: nicholasbishop

Cargo.toml

@@ -1,9 +1,9 @@
 [workspace]
 members = ["ovmf-prebuilt", "xtask"]
-resolver = "2"
+resolver = "3"
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 
 [workspace.dependencies]
 ureq = { version = "3.0", default-features = false, features = ["rustls"] }

ovmf-prebuilt/src/fetch.rs

@@ -23,10 +23,10 @@ pub(crate) fn update_cache(source: Source, prebuilt_dir: &Path) -> Result<(), Er
 
     // Check if the hash file already has the expected hash in it. If so, assume
     // that we've already got the correct prebuilt downloaded and unpacked.
-    if let Ok(current_hash) = fs::read_to_string(&hash_path) {
-        if current_hash == source.sha256 {
-            return Ok(());
-        }
+    if let Ok(current_hash) = fs::read_to_string(&hash_path)
+        && current_hash == source.sha256
+    {
+        return Ok(());
     }
 
     let base_url = "https://github.com/rust-osdev/ovmf-prebuilt/releases/download";
@@ -191,11 +191,13 @@ mod tests {
     #[test]
     fn test_retry_failure() {
         let mut attempts = 0;
-        assert!(retry(2, || {
-            attempts += 1;
-            Err(Error::Download(io::ErrorKind::Interrupted.into()))
-        })
-        .is_err());
+        assert!(
+            retry(2, || {
+                attempts += 1;
+                Err(Error::Download(io::ErrorKind::Interrupted.into()))
+            })
+            .is_err()
+        );
         assert_eq!(attempts, 3);
     }
 }

xtask/src/github.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use serde::Deserialize;
 use ureq::Agent;
 

xtask/src/main.rs

@@ -1,7 +1,7 @@
 mod github;
 mod update_sources;
 
-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 use clap::{Args, Parser, Subcommand};
 use std::fs;
 use std::path::PathBuf;

xtask/src/update_sources.rs

@@ -1,5 +1,5 @@
 use crate::github::Github;
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use std::fs;
 use std::path::Path;