From 73c6966fe3108b885f380d9d3f13615c5d3d23ac Mon Sep 17 00:00:00 2001 From: Altareos Date: Wed, 2 Jul 2025 00:53:55 +0200 Subject: [PATCH] rust edition 2024 --- Cargo.lock | 2 +- Cargo.toml | 4 ++-- src/initrd.rs | 5 ++--- src/lib.rs | 2 +- src/linux.rs | 2 +- src/main.rs | 2 +- src/pe.rs | 2 +- src/secureboot.rs | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02f35bd..0b145d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 4 [[package]] name = "barnacle" -version = "1.0.0" +version = "1.0.1" dependencies = [ "uefi", ] diff --git a/Cargo.toml b/Cargo.toml index dd6c059..540ae13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "barnacle" -version = "1.0.0" -edition = "2021" +version = "1.0.1" +edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/initrd.rs b/src/initrd.rs index aed9a0f..d09c771 100644 --- a/src/initrd.rs +++ b/src/initrd.rs @@ -1,9 +1,8 @@ use core::{ffi::c_void, mem::MaybeUninit}; use uefi::{ - boot, - proto::device_path::{build, DevicePath}, - Guid, Identify, Status, + Guid, Identify, Status, boot, + proto::device_path::{DevicePath, build}, }; const LOADFILE2_GUID: Guid = Guid::parse_or_panic("4006c0c1-fcb3-403e-996d-4a6c8724e06d"); diff --git a/src/lib.rs b/src/lib.rs index 110cda4..ac78d60 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,7 +2,7 @@ use linux::start_linux; use pe::get_loader_sections; -use uefi::{boot, Handle, Status}; +use uefi::{Handle, Status, boot}; mod initrd; mod linux; diff --git a/src/linux.rs b/src/linux.rs index 2e423d7..5da0ecf 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -1,6 +1,6 @@ use core::{ffi::c_void, mem::MaybeUninit, ptr::slice_from_raw_parts}; -use uefi::{boot, proto::loaded_image::LoadedImage, Handle, Result}; +use uefi::{Handle, Result, boot, proto::loaded_image::LoadedImage}; use crate::{ initrd::{install_initrd, make_loader}, diff --git a/src/main.rs b/src/main.rs index 875e3aa..7e45b60 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,9 +3,9 @@ use barnacle::bootloader; +use uefi::Status; use uefi::boot; use uefi::prelude::entry; -use uefi::Status; #[entry] fn main() -> Status { diff --git a/src/pe.rs b/src/pe.rs index a1ba12f..2a412c4 100644 --- a/src/pe.rs +++ b/src/pe.rs @@ -1,5 +1,5 @@ use uefi::proto::loaded_image::LoadedImage; -use uefi::{boot, Error, Handle, Result, Status}; +use uefi::{Error, Handle, Result, Status, boot}; const LINUX_SNAME: [u8; 8] = *b".linux\0\0"; const CMDLINE_SNAME: [u8; 8] = *b".cmdline"; diff --git a/src/secureboot.rs b/src/secureboot.rs index 7587911..6fdb49e 100644 --- a/src/secureboot.rs +++ b/src/secureboot.rs @@ -1,6 +1,6 @@ use core::ffi::c_void; -use uefi::{boot, proto::unsafe_protocol, Result}; +use uefi::{Result, boot, proto::unsafe_protocol}; #[unsafe_protocol("A46423E3-4617-49F1-B9FF-D1BFA9115839")] struct SecurityArch {