Skip to content

Commit 43b7420

Browse files
committed
multiboot2: memory-map: derive Eq + [email protected]
1 parent d48ba09 commit 43b7420

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

multiboot2/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ bitflags.workspace = true
4545
derive_more.workspace = true
4646
log.workspace = true
4747

48-
uefi-raw = { version = "0.2.0", default-features = false }
49-
ptr_meta = { version = "0.2.0", default-features = false }
48+
uefi-raw = { version = "0.3", default-features = false }
49+
ptr_meta = { version = "0.2", default-features = false }

multiboot2/src/builder/information.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ use core::mem::size_of;
1414
/// Builder to construct a valid Multiboot2 information dynamically at runtime.
1515
/// The tags will appear in the order of their corresponding enumeration,
1616
/// except for the END tag.
17-
#[derive(Debug)]
18-
// #[derive(Debug, PartialEq, Eq)] // wait for uefi-raw 0.3.0
17+
#[derive(Debug, PartialEq, Eq)]
1918
pub struct InformationBuilder {
2019
basic_memory_info_tag: Option<BasicMemoryInfoTag>,
2120
boot_loader_name_tag: Option<Box<BootLoaderNameTag>>,

multiboot2/src/memory_map.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@ const EFI_METADATA_SIZE: usize = mem::size_of::<TagTypeId>() + 3 * mem::size_of:
206206

207207
/// EFI memory map as per EFI specification.
208208
#[derive(ptr_meta::Pointee)]
209-
// #[derive(Debug, PartialEq, Eq)] // wait for uefi-raw 0.3.0
210-
#[derive(Debug)]
209+
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
211210
#[repr(C)]
212211
pub struct EFIMemoryMapTag {
213212
typ: TagTypeId,

0 commit comments

Comments
 (0)