Bump rust edition to 2024

eliasol · eliasol · commit a4acecc3b3dc · 2026-03-03T15:47:56.000+01:00
diff --git a/pixie-server/Cargo.toml b/pixie-server/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-edition = "2021"
+edition = "2024"
 name = "pixie-server"
 version = "0.1.0"
 
diff --git a/pixie-server/src/http.rs b/pixie-server/src/http.rs
@@ -3,12 +3,12 @@
 use crate::state::{State, UnitSelector};
 use anyhow::Result;
 use axum::{
+    Router,
     body::Body,
     extract::{self, Path},
     http::{Response, StatusCode},
     response::IntoResponse,
     routing::get,
-    Router,
 };
 use futures::StreamExt;
 use pixie_shared::{Action, HttpConfig, StatusUpdate};
diff --git a/pixie-server/src/main.rs b/pixie-server/src/main.rs
@@ -6,7 +6,7 @@ mod tcp;
 mod udp;
 
 use crate::state::State;
-use anyhow::{bail, ensure, Context, Result};
+use anyhow::{Context, Result, bail, ensure};
 use clap::Parser;
 use interfaces::Interface;
 use ipnet::Ipv4Net;
diff --git a/pixie-server/src/state/images.rs b/pixie-server/src/state/images.rs
@@ -1,5 +1,5 @@
-use crate::state::{atomic_write, State, CHUNKS_DIR, IMAGES_DIR};
-use anyhow::{ensure, Context, Result};
+use crate::state::{CHUNKS_DIR, IMAGES_DIR, State, atomic_write};
+use anyhow::{Context, Result, ensure};
 use pixie_shared::{ChunkHash, ChunkStats, ChunksStats, Image, ImagesStats, MAX_CHUNK_SIZE};
 use tokio::sync::watch;
 
diff --git a/pixie-server/src/state/mod.rs b/pixie-server/src/state/mod.rs
@@ -13,7 +13,7 @@
 mod images;
 mod units;
 
-use anyhow::{anyhow, ensure, Context, Result};
+use anyhow::{Context, Result, anyhow, ensure};
 use pixie_shared::{
     ChunkHash, ChunkStats, ChunksStats, Config, Image, ImagesStats, RegistrationInfo, Unit,
 };
@@ -24,8 +24,8 @@ use std::{
     net::{IpAddr, Ipv4Addr},
     path::{Path, PathBuf},
     sync::{
-        atomic::{AtomicU64, Ordering},
         Mutex,
+        atomic::{AtomicU64, Ordering},
     },
 };
 use tokio::sync::watch;
diff --git a/pixie-server/src/state/units.rs b/pixie-server/src/state/units.rs
@@ -1,5 +1,5 @@
 use crate::state::State;
-use anyhow::{bail, ensure, Result};
+use anyhow::{Result, bail, ensure};
 use macaddr::MacAddr6;
 use pixie_shared::{Action, RegistrationInfo, Unit};
 use std::net::Ipv4Addr;
diff --git a/pixie-server/src/tcp.rs b/pixie-server/src/tcp.rs
@@ -6,7 +6,7 @@ use crate::{
 };
 use anyhow::{Context, Result};
 use macaddr::MacAddr6;
-use pixie_shared::{TcpRequest, ACTION_PORT};
+use pixie_shared::{ACTION_PORT, TcpRequest};
 use std::{
     io::ErrorKind,
     net::{Ipv4Addr, SocketAddr},
diff --git a/pixie-server/src/udp.rs b/pixie-server/src/udp.rs
@@ -4,12 +4,12 @@ use crate::{
     find_mac,
     state::{State, UnitSelector},
 };
-use anyhow::{ensure, Context, Result};
+use anyhow::{Context, Result, ensure};
 use futures::FutureExt;
 use ipnet::Ipv4Net;
 use pixie_shared::{
-    chunk_codec::Encoder, ChunkHash, HintPacket, InterfaceConfig, RegistrationInfo, UdpRequest,
-    ACTION_PORT, CHUNKS_PORT, HINT_PORT, UDP_BODY_LEN,
+    ACTION_PORT, CHUNKS_PORT, ChunkHash, HINT_PORT, HintPacket, InterfaceConfig, RegistrationInfo,
+    UDP_BODY_LEN, UdpRequest, chunk_codec::Encoder,
 };
 use std::{
     collections::BTreeSet,
@@ -123,12 +123,11 @@ fn compute_hint(state: &State) -> Result<RegistrationInfo> {
         .map(|unit| (unit.row, unit.col))
         .collect::<Vec<_>>();
 
-    if last.row == 0 {
-        if let Some(&(r, c)) = positions.iter().max() {
+    if last.row == 0
+        && let Some(&(r, c)) = positions.iter().max() {
             last.row = r;
             last.col = c;
         }
-    }
 
     let (mrow, mcol) = positions
         .iter()
diff --git a/pixie-shared/Cargo.toml b/pixie-shared/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pixie-shared"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 blake3 = { version = "1", default-features = false }
diff --git a/pixie-uefi/Cargo.toml b/pixie-uefi/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-edition = "2021"
+edition = "2024"
 name = "pixie-uefi"
 version = "0.1.0"
 
diff --git a/pixie-uefi/src/flash.rs b/pixie-uefi/src/flash.rs
@@ -7,20 +7,20 @@ use core::mem;
 use core::net::SocketAddrV4;
 use core::time::Duration;
 
-use futures::future::{select, Either};
+use futures::future::{Either, select};
 use log::info;
 use lz4_flex::decompress;
 use pixie_shared::chunk_codec::Decoder;
 use pixie_shared::util::BytesFmt;
-use pixie_shared::{ChunkHash, Image, TcpRequest, UdpRequest, CHUNKS_PORT, MAX_CHUNK_SIZE};
+use pixie_shared::{CHUNKS_PORT, ChunkHash, Image, MAX_CHUNK_SIZE, TcpRequest, UdpRequest};
 
+use crate::MIN_MEMORY;
 use crate::os::boot_options::BootOptions;
 use crate::os::error::{Error, Result};
 use crate::os::executor::Executor;
-use crate::os::net::{TcpStream, UdpSocket, ETH_PACKET_SIZE};
-use crate::os::ui::{update_content, DrawArea};
+use crate::os::net::{ETH_PACKET_SIZE, TcpStream, UdpSocket};
+use crate::os::ui::{DrawArea, update_content};
 use crate::os::{disk, memory};
-use crate::MIN_MEMORY;
 
 async fn fetch_image(stream: &TcpStream) -> Result<Image> {
     let req = TcpRequest::GetImage;
diff --git a/pixie-uefi/src/main.rs b/pixie-uefi/src/main.rs
@@ -10,13 +10,13 @@ use core::net::{Ipv4Addr, SocketAddrV4};
 use core::time::Duration;
 
 use futures::future::{self, Either};
-use pixie_shared::{Action, TcpRequest, UdpRequest, ACTION_PORT, PING_PORT};
-use uefi::{entry, Status};
+use pixie_shared::{ACTION_PORT, Action, PING_PORT, TcpRequest, UdpRequest};
+use uefi::{Status, entry};
 
 use crate::flash::flash;
 use crate::os::error::{Error, Result};
 use crate::os::executor::Executor;
-use crate::os::net::{TcpStream, UdpSocket, ETH_PACKET_SIZE};
+use crate::os::net::{ETH_PACKET_SIZE, TcpStream, UdpSocket};
 use crate::os::ui::update_content;
 use crate::register::register;
 use crate::store::store;
diff --git a/pixie-uefi/src/os/disk.rs b/pixie-uefi/src/os/disk.rs
@@ -1,11 +1,11 @@
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
 
-use gpt_disk_io::gpt_disk_types::{BlockSize, Lba};
 use gpt_disk_io::BlockIo;
+use gpt_disk_io::gpt_disk_types::{BlockSize, Lba};
+use uefi::Handle;
 use uefi::boot::{OpenProtocolParams, ScopedProtocol};
 use uefi::proto::media::block::BlockIO;
-use uefi::Handle;
 
 use super::error::Result;
 use crate::os::executor::Executor;
diff --git a/pixie-uefi/src/os/executor/mod.rs b/pixie-uefi/src/os/executor/mod.rs
@@ -1,11 +1,11 @@
 use alloc::boxed::Box;
-use alloc::collections::binary_heap::BinaryHeap;
 use alloc::collections::VecDeque;
+use alloc::collections::binary_heap::BinaryHeap;
 use alloc::sync::Arc;
 use alloc::task::Wake;
 use alloc::vec::Vec;
 use core::fmt::Write;
-use core::future::{poll_fn, Future};
+use core::future::{Future, poll_fn};
 use core::pin::Pin;
 use core::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use core::task::{Context, Poll, Waker};
diff --git a/pixie-uefi/src/os/input.rs b/pixie-uefi/src/os/input.rs
@@ -1,5 +1,5 @@
-use spin::lazy::Lazy;
 use spin::Mutex;
+use spin::lazy::Lazy;
 use uefi::boot::ScopedProtocol;
 use uefi::proto::console::text::{Input, Key};
 
diff --git a/pixie-uefi/src/os/net/interface.rs b/pixie-uefi/src/os/net/interface.rs
@@ -1,8 +1,8 @@
 use smoltcp::phy::{Device, DeviceCapabilities, Medium, RxToken, TxToken};
 use smoltcp::time::Instant;
+use uefi::Status;
 use uefi::boot::ScopedProtocol;
 use uefi::proto::network::snp::{ReceiveFlags, SimpleNetwork};
-use uefi::Status;
 
 use super::ETH_PACKET_SIZE;
 use crate::os::send_wrapper::SendWrapper;
@@ -73,11 +73,10 @@ impl TxToken for SnpTxToken<'_> {
         while snp.get_recycled_transmit_buffer_status().unwrap().is_none() {
             if snp.mode().media_present.0 == 0 {
                 let err = uefi::boot::set_watchdog_timer(0, 0x10000, None);
-                if let Err(err) = err {
-                    if err.status() != Status::UNSUPPORTED {
+                if let Err(err) = err
+                    && err.status() != Status::UNSUPPORTED {
                         log::error!("Error disabling watchdog: {err:?}");
                     }
-                }
                 ui::red_screen();
                 input::wait_for_key().expect("Failed to wait for input");
                 power_control::reset();
diff --git a/pixie-uefi/src/os/net/mod.rs b/pixie-uefi/src/os/net/mod.rs
@@ -11,18 +11,18 @@ use smoltcp::iface::{
 use smoltcp::socket::dhcpv4::{Event, Socket as Dhcpv4Socket};
 use smoltcp::wire::{DhcpOption, HardwareAddress, IpCidr};
 use spin::Mutex;
+use uefi::Handle;
+use uefi::proto::Protocol;
 use uefi::proto::console::text::Color;
+use uefi::proto::device_path::DevicePath;
 use uefi::proto::device_path::build::DevicePathBuilder;
 use uefi::proto::device_path::text::{AllowShortcuts, DevicePathToText, DisplayOnly};
-use uefi::proto::device_path::DevicePath;
 use uefi::proto::network::snp::SimpleNetwork;
-use uefi::proto::Protocol;
-use uefi::Handle;
 
 use super::timer::Timer;
 use crate::os::boot_options::BootOptions;
-use crate::os::executor::event::{Event as ExecutorEvent, EventTrigger};
 use crate::os::executor::Executor;
+use crate::os::executor::event::{Event as ExecutorEvent, EventTrigger};
 use crate::os::net::interface::SnpDevice;
 pub use crate::os::net::tcp::TcpStream;
 pub use crate::os::net::udp::UdpSocket;
diff --git a/pixie-uefi/src/os/net/tcp.rs b/pixie-uefi/src/os/net/tcp.rs
@@ -1,5 +1,5 @@
 use alloc::boxed::Box;
-use core::future::{poll_fn, Future};
+use core::future::{Future, poll_fn};
 use core::net::SocketAddrV4;
 use core::task::Poll;
 
diff --git a/pixie-uefi/src/os/net/udp.rs b/pixie-uefi/src/os/net/udp.rs
@@ -1,4 +1,4 @@
-use core::future::{poll_fn, Future};
+use core::future::{Future, poll_fn};
 use core::net::{IpAddr, SocketAddrV4};
 use core::task::Poll;
 
@@ -8,7 +8,7 @@ use smoltcp::wire::IpEndpoint;
 
 use crate::os::error::Result;
 use crate::os::net::speed::{RX_SPEED, TX_SPEED};
-use crate::os::net::{with_net, ETH_PACKET_SIZE};
+use crate::os::net::{ETH_PACKET_SIZE, with_net};
 
 pub struct UdpSocket {
     handle: SocketHandle,
diff --git a/pixie-uefi/src/os/ui.rs b/pixie-uefi/src/os/ui.rs
@@ -4,8 +4,8 @@ use core::sync::atomic::{AtomicUsize, Ordering};
 use core::time::Duration;
 
 use pixie_shared::util::BytesFmt;
-use spin::lazy::Lazy;
 use spin::Mutex;
+use spin::lazy::Lazy;
 use uefi::boot::ScopedProtocol;
 use uefi::proto::console::text::{Color, Output};
 use uefi::{CStr16, Char16};
diff --git a/pixie-uefi/src/parse_disk/mod.rs b/pixie-uefi/src/parse_disk/mod.rs
@@ -1,8 +1,8 @@
 use alloc::vec::Vec;
 
 use log::info;
-use pixie_shared::util::BytesFmt;
 use pixie_shared::MAX_CHUNK_SIZE;
+use pixie_shared::util::BytesFmt;
 
 use crate::os::disk::Disk;
 use crate::os::error::Result;
diff --git a/pixie-uefi/src/register.rs b/pixie-uefi/src/register.rs
@@ -4,12 +4,12 @@ use alloc::vec::Vec;
 use core::cell::RefCell;
 use core::net::SocketAddrV4;
 
-use futures::future::{select, Either};
-use pixie_shared::{HintPacket, RegistrationInfo, TcpRequest, HINT_PORT};
+use futures::future::{Either, select};
+use pixie_shared::{HINT_PORT, HintPacket, RegistrationInfo, TcpRequest};
 use uefi::proto::console::text::{Color, Key, ScanCode};
 
 use crate::os::error::{Error, Result};
-use crate::os::net::{TcpStream, UdpSocket, ETH_PACKET_SIZE};
+use crate::os::net::{ETH_PACKET_SIZE, TcpStream, UdpSocket};
 use crate::os::ui::DrawArea;
 use crate::os::{input, ui};
 
diff --git a/pixie-uefi/src/store.rs b/pixie-uefi/src/store.rs
@@ -6,14 +6,14 @@ use core::net::SocketAddrV4;
 use log::info;
 use lz4_flex::compress;
 use pixie_shared::util::BytesFmt;
-use pixie_shared::{Chunk, Image, Offset, TcpRequest, UdpRequest, MAX_CHUNK_SIZE};
+use pixie_shared::{Chunk, Image, MAX_CHUNK_SIZE, Offset, TcpRequest, UdpRequest};
 
 use crate::os::boot_options::BootOptions;
 use crate::os::error::{Error, Result};
 use crate::os::net::{TcpStream, UdpSocket};
 use crate::os::ui::DrawArea;
 use crate::os::{disk, memory, ui};
-use crate::{parse_disk, MIN_MEMORY};
+use crate::{MIN_MEMORY, parse_disk};
 
 #[derive(Debug)]
 pub struct ChunkInfo {
diff --git a/pixie-web/Cargo.toml b/pixie-web/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pixie-web"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [[bin]]
 name = "pixie-web"
diff --git a/pixie-web/src/main.rs b/pixie-web/src/main.rs
@@ -5,7 +5,7 @@ use gloo_net::http::Request;
 use js_sys::Uint8Array;
 use leptos::*;
 use leptos_use::{use_preferred_dark, use_timestamp};
-use pixie_shared::{util::BytesFmt, Config, ImagesStats, StatusUpdate, Unit};
+use pixie_shared::{Config, ImagesStats, StatusUpdate, Unit, util::BytesFmt};
 use thaw::{
     Button, ButtonColor, ButtonGroup, ButtonVariant, GlobalStyle, Popover, PopoverPlacement,
     PopoverTrigger, Space, Table, Theme, ThemeProvider,
