chore: bump rust edition

Author: cilki

Cargo.lock

@@ -14,10 +14,11 @@ members = [
 anyhow = "1.0.76"
 fossable = "0.1.2"
 hex = "0.4.3"
-rand = "0.8.5"
+rand = "0.9.0"
 regex = "1.10.2"
 serde = { version = "1.0.192", features = ["derive"] }
 sha2 = "0.10.8"
 strum = { version = "0.27.1", features = ["derive"] }
 tracing = "0.1.40"
 zstd = "0.13.0"
+reqwest = "0.12.15"

Cargo.toml

@@ -1,18 +1,18 @@
 [package]
 authors = ["Tyler Cook"]
 description = "Defines the goldboot image format"
-edition = "2021"
+edition = "2024"
 homepage = "https://goldboot.fossable.org"
 license = "AGPL-3.0-only"
 name = "goldboot-image"
 repository = "https://github.com/fossable/goldboot"
-rust-version = "1.74"
+rust-version = "1.85"
 version = "0.0.5"
 
 [dependencies]
 aes-gcm = { version = "0.10.3", features = ["std"] }
 anyhow = { workspace = true }
-binrw = "0.13.1"
+binrw = "0.14.1"
 flate2 = "1.0.28"
 hex = { workspace = true }
 rand = { workspace = true }

goldboot-image/Cargo.toml

@@ -1,21 +1,18 @@
 //!
 
 use crate::qcow::Qcow3;
-use aes_gcm::KeyInit;
-use aes_gcm::{aead::Aead, Aes256Gcm, Key, Nonce};
-use anyhow::bail;
-use anyhow::Result;
+use aes_gcm::{Aes256Gcm, Key, KeyInit, Nonce, aead::Aead};
+use anyhow::{Result, bail};
 use binrw::{BinRead, BinReaderExt, BinWrite};
 use rand::Rng;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
-use std::ffi::CStr;
-use std::path::PathBuf;
 use std::{
+    ffi::CStr,
     fs::File,
     io::{BufReader, Cursor, Read, Seek, SeekFrom, Write},
-    path::Path,
+    path::{Path, PathBuf},
     time::{SystemTime, UNIX_EPOCH},
 };
 use strum::{Display, EnumIter};
@@ -639,16 +636,16 @@ impl ImageBuilder {
 
         // Prepare cipher and RNG if the image header should be encrypted
         let header_cipher = new_key(self.password.clone().unwrap_or("".to_string()));
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
 
         // Prepare directory
         let mut directory = Directory {
-            protected_nonce: rng.gen::<[u8; 12]>(),
+            protected_nonce: rng.random::<[u8; 12]>(),
             protected_size: 0,
-            config_nonce: rng.gen::<[u8; 12]>(),
+            config_nonce: rng.random::<[u8; 12]>(),
             config_offset: 0,
             config_size: 0,
-            digest_table_nonce: rng.gen::<[u8; 12]>(),
+            digest_table_nonce: rng.random::<[u8; 12]>(),
             digest_table_offset: 0,
             digest_table_size: 0,
         };
@@ -658,7 +655,7 @@ impl ImageBuilder {
             version: 1,
             arch: ImageArch::Amd64, // TODO
             size,
-            directory_nonce: rng.gen::<[u8; 12]>(),
+            directory_nonce: rng.random::<[u8; 12]>(),
             directory_offset: 0,
             directory_size: 0,
             timestamp: SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs(),
@@ -684,15 +681,15 @@ impl ImageBuilder {
             } else {
                 ClusterEncryptionType::None
             },
-            cluster_key: rng.gen::<[u8; 32]>(),
+            cluster_key: rng.random::<[u8; 32]>(),
             nonce_count: 0,
             nonce_table: vec![],
         };
 
         if self.password.is_some() {
             protected_header.nonce_count = protected_header.cluster_count;
             protected_header.nonce_table = (0..protected_header.cluster_count)
-                .map(|_| rng.gen::<[u8; 12]>())
+                .map(|_| rng.random::<[u8; 12]>())
                 .collect();
         }
 
@@ -815,13 +812,15 @@ impl ImageBuilder {
                         cluster_count += 1;
                     }
                     block_offset += source.header.cluster_size();
-                    // self.progress(source.header.cluster_size(), source.header.size);
+                    // self.progress(source.header.cluster_size(),
+                    // source.header.size);
                 }
             } else {
                 block_offset +=
                     source.header.cluster_size() * source.header.l2_entries_per_cluster();
                 // self.progress(
-                //     source.header.cluster_size() * source.header.l2_entries_per_cluster(),
+                //     source.header.cluster_size() *
+                // source.header.l2_entries_per_cluster(),
                 //     source.header.size,
                 // );
             }
@@ -891,12 +890,13 @@ mod tests {
     #[test]
     fn convert_random_data() -> Result<()> {
         let tmp = tempfile::tempdir()?;
+        let rng = rand::rng();
 
         // Generate file of random size and contents
-        let size = rand::thread_rng().gen_range(512..=1000);
+        let size = rng.gen_range(512..=1000);
         let mut raw: Vec<u8> = Vec::new();
         for _ in 0..size {
-            raw.push(rand::thread_rng().gen());
+            raw.push(rng.random());
         }
 
         // Write out for qemu-img

goldboot-image/src/lib.rs

@@ -44,11 +44,11 @@ pub struct QcowHeader {
     _refcount_table_clusters: u32,
 
     /// Number of snapshots contained in the image
-    _nb_snapshots: u32,
+    pub nb_snapshots: u32,
 
     /// Offset into the image file at which the snapshot table
     /// starts. Must be aligned to a cluster boundary.
-    _snapshots_offset: u64,
+    pub snapshots_offset: u64,
 
     /// Bitmask of incompatible features. An implementation must fail to open an
     /// image if an unknown bit is set.

goldboot-image/src/qcow/header.rs

@@ -1,6 +1,6 @@
-use anyhow::bail;
-use anyhow::Result;
+use anyhow::{bail, Result};
 use binrw::{io::SeekFrom, BinRead, BinReaderExt};
+use snapshot::Snapshot;
 use std::{
     fs::File,
     io::BufReader,
@@ -15,13 +15,19 @@ pub use header::*;
 pub mod levels;
 use levels::*;
 
+mod snapshot;
+
 /// Represents a (stripped down) qcow3 file on disk.
 #[derive(BinRead, Debug)]
 #[brw(big)]
 pub struct Qcow3 {
     /// The image header
     pub header: QcowHeader,
 
+    /// List of snapshots present within this qcow
+    #[br(seek_before = SeekFrom::Start(header.snapshots_offset), count = header.nb_snapshots)]
+    pub snapshots: Vec<Snapshot>,
+
     /// The "active" L1 table
     #[br(seek_before = SeekFrom::Start(header.l1_table_offset), count = header.l1_size)]
     pub l1_table: Vec<L1Entry>,

goldboot-image/src/qcow/mod.rs

@@ -0,0 +1,94 @@
+use super::levels::L1Entry;
+use binrw::{BinRead, binread, io::SeekFrom};
+
+/// An entry in the snapshot table representing the system state at a moment in
+/// time
+#[binread]
+#[derive(Debug)]
+pub struct Snapshot {
+    /// Offset into the image file at which the L1 table for the
+    /// snapshot starts. Must be aligned to a cluster boundary.
+    #[br(temp)]
+    l1_table_offset: u64,
+
+    /// Number of entries in the L1 table of the snapshots
+    #[br(temp)]
+    l1_entry_count: u32,
+
+    /// Table of L1 entries in the screenshot
+    #[br(restore_position, seek_before = SeekFrom::Start(l1_table_offset), count = l1_entry_count)]
+    pub l1_table: Vec<L1Entry>,
+
+    /// Length of the unique ID string describing the snapshot
+    #[br(temp)]
+    unique_id_len: u16,
+
+    /// Length of the name of the snapshot
+    #[br(temp)]
+    name_len: u16,
+
+    /// Time at which the snapshot was taken since the Epoch
+    pub time: SnapshotTime,
+
+    /// Time that the guest was running until the snapshot was taken in
+    /// nanoseconds
+    pub guest_runtime: u64,
+
+    /// Size of the VM state in bytes. 0 if no VM state is saved.
+    ///
+    /// If there is VM state, it starts at the first cluster
+    /// described by first L1 table entry that doesn't describe a
+    /// regular guest cluster (i.e. VM state is stored like guest
+    /// disk content, except that it is stored at offsets that are
+    /// larger than the virtual disk presented to the guest)
+    pub vm_state_size: u32,
+
+    #[br(temp)]
+    extra_data_size: u32,
+
+    /// Optional extra snapshot data that comes from format updates
+    #[br(pad_size_to = extra_data_size)]
+    #[br(args(extra_data_size))]
+    pub extra_data: SnapshotExtraData,
+
+    /// A unique identifier for the snapshot (example value: "1")
+    #[br(count = unique_id_len, try_map = String::from_utf8)]
+    pub unique_id: String,
+
+    /// Name of the snapshot
+    #[br(count = name_len, try_map = String::from_utf8)]
+    pub name: String,
+}
+
+/// Optional extra snapshot data that comes from format updates
+///
+/// **Note:** Version 3 snapshots must have both vm_state_size and
+/// virtual_disk_size present.
+#[derive(BinRead, Debug)]
+#[br(import(size: u32))]
+pub struct SnapshotExtraData {
+    /// Size of the VM state in bytes. 0 if no VM state is saved. If this field
+    /// is present, the 32-bit value in Snapshot.vm_state_size is ignored.
+    #[br(if(size >= 8))]
+    pub vm_state_size: u64,
+
+    /// Virtual disk size of the snapshot in bytes
+    #[br(if(size >= 16))]
+    pub virtual_disk_size: Option<u64>,
+
+    /// icount value which corresponds to the record/replay instruction count
+    /// when the snapshot was taken. Set to -1 if icount was disabled
+    #[br(if(size >= 24))]
+    pub instruction_count: Option<i64>,
+}
+
+/// Represents the time a snapshot was taken in the form of seconds,
+/// nanoseconds. The nanoseconds represent the sub-second time of the snapshot.
+#[derive(BinRead, Debug)]
+pub struct SnapshotTime {
+    /// Seconds since the unix epoch
+    pub secs: u32,
+
+    /// Subsecond portion of time in nanoseconds
+    pub nanosecs: u32,
+}

goldboot-image/src/qcow/snapshot.rs

@@ -1,25 +1,25 @@
 [package]
 authors = ["Tyler Cook"]
 description = "A command-line application for building goldboot images"
-edition = "2021"
+edition = "2024"
 homepage = "https://goldboot.org"
 license = "AGPL-3.0-only"
 name = "goldboot-linux"
 repository = "https://github.com/fossable/goldboot"
-rust-version = "1.74"
+rust-version = "1.85"
 version = "0.0.3"
 
 [dependencies]
 block-utils = { version = "0.11.1" }
 built = { version = "0.7", features = ["chrono", "semver"] }
 clap = { version = "4.4.7", features = ["derive", "string"] }
-gdk4 = { version = "0.8.1" }
-gdk-pixbuf = { version = "0.19.2" }
-glib-macros = { version = "0.19.2" }
-glib = { version = "0.19.2" }
-goldboot-image = { path="../goldboot-image", version = "0.0.5" }
-goldboot = { path="../goldboot", version = "0.0.10" }
-gtk4 = { version = "0.8.1", features = ["v4_12"] }
+gdk4 = { version = "0.9.6" }
+gdk-pixbuf = { version = "0.20.9" }
+glib-macros = { version = "0.20.7" }
+glib = { version = "0.20.9" }
+goldboot-image = { path = "../goldboot-image", version = "0.0.5" }
+goldboot = { path = "../goldboot", version = "0.0.10" }
+gtk4 = { version = "0.9.6", features = ["v4_12"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 ubyte = "0.10.4"

goldboot-linux/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 authors = ["Tyler Cook"]
 description = "Supporting macros for goldboot"
-edition = "2021"
+edition = "2024"
 license = "AGPL-3.0-only"
 name = "goldboot-macros"
-rust-version = "1.74"
+rust-version = "1.85"
 version = "0.0.3"
 repository = "https://github.com/fossable/goldboot"
 

goldboot-macros/Cargo.toml

@@ -23,7 +23,7 @@ fn impl_prompt(ast: &syn::DeriveInput) -> TokenStream {
         _ => panic!(),
     };
 
-    let gen = quote! {
+    let syntax = quote! {
         impl Prompt for #name {
             fn prompt(
                 &mut self,
@@ -34,7 +34,7 @@ fn impl_prompt(ast: &syn::DeriveInput) -> TokenStream {
             }
         }
     };
-    gen.into()
+    syntax.into()
 }
 
 // TODO probably need a macro for ImageMold and Fabricator

goldboot-macros/src/lib.rs

@@ -2,22 +2,22 @@
 name = "goldboot-registry"
 description = "A web service for hosting goldboot images"
 version = "0.0.5"
-edition = "2021"
+edition = "2024"
 license = "AGPL-3.0-only"
 authors = ["Tyler Cook"]
 readme = "README.md"
 homepage = "https://goldboot.org"
 repository = "https://github.com/fossable/goldboot"
-rust-version = "1.74"
+rust-version = "1.85"
 
 [dependencies]
 anyhow = "1.0.76"
-axum = "0.7.4"
+axum = "0.8.3"
 clap = { version = "4.4.7", features = ["derive", "string"] }
-goldboot-image = { path="../goldboot-image", version = "0.0.5" }
-goldboot = { path="../goldboot", version = "0.0.10" }
-reqwest = { version = "0.11.22", features = ["stream"] }
-tftpd = { version = "0.2.12", optional = true }
+goldboot-image = { path = "../goldboot-image", version = "0.0.5" }
+goldboot = { path = "../goldboot", version = "0.0.10" }
+reqwest = { workspace = true, features = ["stream"] }
+tftpd = { version = "0.3.3", optional = true }
 tokio = { version = "1.34.0", features = ["full"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

goldboot-registry/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "goldboot-uefi"
 version = "0.1.0"
-edition = "2021"
-rust-version = "1.74"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]