Skip to content

Commit 7ab7103

Browse files
committed
multiboot2: consume multiboot2-common (1/N): ALIGNMENT constant
1 parent 6ed74ef commit 7ab7103

File tree

5 files changed

+6
-3
lines changed

5 files changed

+6
-3
lines changed

Cargo.lock

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

multiboot2/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ bitflags.workspace = true
4545
derive_more.workspace = true
4646
log.workspace = true
4747
ptr_meta.workspace = true
48+
multiboot2-common = "0.1.0"
4849

4950
# We only use a very basic type definition from this crate. To prevent MSRV
5051
# bumps from uefi-raw, I restrict this here. Upstream users are likely to have

multiboot2/src/builder/information.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ use crate::{
66
EFIBootServicesNotExitedTag, EFIImageHandle32Tag, EFIImageHandle64Tag, EFIMemoryMapTag,
77
EFISdt32Tag, EFISdt64Tag, ElfSectionsTag, EndTag, FramebufferTag, ImageLoadPhysAddrTag,
88
MemoryMapTag, ModuleTag, RsdpV1Tag, RsdpV2Tag, SmbiosTag, TagTrait, TagType, VBEInfoTag,
9-
ALIGNMENT,
109
};
1110
use alloc::vec::Vec;
1211
use core::fmt::{Display, Formatter};
1312
use core::mem::size_of;
1413
use core::ops::Deref;
14+
use multiboot2_common::ALIGNMENT;
1515

1616
/// Holds the raw bytes of a boot information built with [`InformationBuilder`]
1717
/// on the heap. The bytes returned by [`BootInformationBytes::as_bytes`] are

multiboot2/src/tag.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
//! - [`GenericTag`] --> cast to desired tag
1111
1212
use crate::util::increase_to_alignment;
13-
use crate::{TagTrait, TagType, TagTypeId, ALIGNMENT};
13+
use crate::{TagTrait, TagType, TagTypeId};
1414
use core::fmt::{Debug, Formatter};
1515
use core::mem;
1616
use core::ops::Deref;
1717
use core::ptr;
18+
use multiboot2_common::ALIGNMENT;
1819

1920
/// The common header that all tags have in common. This type is ABI compatible.
2021
///

multiboot2/src/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! Various utilities.
22
3-
use crate::ALIGNMENT;
43
use core::fmt;
54
use core::fmt::{Display, Formatter};
65
use core::str::Utf8Error;
6+
use multiboot2_common::ALIGNMENT;
77
#[cfg(feature = "alloc")]
88
use {
99
crate::{TagHeader, TagTrait},

0 commit comments

Comments
 (0)