Update uefi-rs to 0.33

hhuOS · Nov 25, 2024 · 249b217 · 249b217
1 parent 13c4b03
commit 249b217
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/towboot/Cargo.toml b/towboot/Cargo.toml
@@ -12,7 +12,7 @@ default-target = "i686-unknown-uefi"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uefi = { version = "0.32", features = ["alloc", "global_allocator", "logger", "panic_handler"] }
+uefi = { version = "0.33", features = ["alloc", "global_allocator", "logger", "panic_handler"] }
 acpi = "5.0"
 smbios-lib = { git = "https://github.com/hhuOS/smbios-lib.git", branch = "main", default-features = false, features = ["no_std"] }
 x86 =  "0.52"

diff --git a/towboot/src/mem.rs b/towboot/src/mem.rs
@@ -15,9 +15,8 @@ use alloc::collections::btree_set::BTreeSet;
 use alloc::vec::Vec;
 
 use uefi::prelude::*;
-use uefi::boot::{allocate_pages, free_pages, memory_map};
-use uefi::mem::memory_map::{MemoryMap, MemoryMapMut};
-use uefi::table::boot::{AllocateType, MemoryDescriptor, MemoryType};
+use uefi::boot::{AllocateType, allocate_pages, free_pages, memory_map};
+use uefi::mem::memory_map::{MemoryDescriptor, MemoryMap, MemoryMapMut, MemoryType};
 
 use log::{debug, warn, error};
 

diff --git a/towboot/src/menu.rs b/towboot/src/menu.rs
@@ -4,10 +4,9 @@ use alloc::collections::btree_map::BTreeMap;
 use alloc::string::String;
 
 use uefi::prelude::*;
-use uefi::boot::{create_event, set_timer, wait_for_event};
+use uefi::boot::{EventType, TimerTrigger, Tpl, create_event, set_timer, wait_for_event};
 use uefi::proto::console::text::{Key, ScanCode};
 use uefi::system::{with_stdin, with_stdout};
-use uefi::table::boot::{EventType, TimerTrigger, Tpl};
 
 use log::{error, warn};