multiboot2-common: move more functionality to common

Author: phip1611

multiboot2-common/src/lib.rs

@@ -204,6 +204,18 @@ impl From<DynSizedStructureError> for MemoryError {
 
 // todo impl core::error::Error
 
+/// Increases the given size to the next alignment boundary, if it is not a
+/// multiple of the alignment yet. This is relevant as in Rust's [type layout],
+/// the allocated size of a type is always a multiple of the alignment, even
+/// if the type is smaller.
+///
+/// [type layout]: https://doc.rust-lang.org/reference/type-layout.html
+#[must_use]
+pub const fn increase_to_alignment(size: usize) -> usize {
+    let mask = ALIGNMENT - 1;
+    (size + mask) & !mask
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -241,4 +253,13 @@ mod tests {
             })
         );
     }
+
+    #[test]
+    fn test_increase_to_alignment() {
+        assert_eq!(increase_to_alignment(0), 0);
+        assert_eq!(increase_to_alignment(1), 8);
+        assert_eq!(increase_to_alignment(7), 8);
+        assert_eq!(increase_to_alignment(8), 8);
+        assert_eq!(increase_to_alignment(9), 16);
+    }
 }

multiboot2/src/builder/information.rs

@@ -1,6 +1,5 @@
 //! Exports item [`InformationBuilder`].
 use crate::builder::AsBytes;
-use crate::util::increase_to_alignment;
 use crate::{
     BasicMemoryInfoTag, BootInformationHeader, BootLoaderNameTag, CommandLineTag,
     EFIBootServicesNotExitedTag, EFIImageHandle32Tag, EFIImageHandle64Tag, EFIMemoryMapTag,
@@ -11,6 +10,7 @@ use alloc::vec::Vec;
 use core::fmt::{Display, Formatter};
 use core::mem::size_of;
 use core::ops::Deref;
+use multiboot2_common::increase_to_alignment;
 use multiboot2_common::ALIGNMENT;
 
 /// Holds the raw bytes of a boot information built with [`InformationBuilder`]

multiboot2/src/tag.rs

@@ -9,11 +9,11 @@
 //! - [`TagBytesRef`] + [`TagHeader`] --> [`GenericTag`]
 //! - [`GenericTag`] --> cast to desired tag
 
-use crate::util::increase_to_alignment;
 use crate::{TagTrait, TagType, TagTypeId};
 use core::fmt::{Debug, Formatter};
 use core::mem;
 use core::ptr;
+use multiboot2_common::increase_to_alignment;
 use multiboot2_common::{BytesRef, DynSizedStructure, Header};
 
 /// The common header that all tags have in common. This type is ABI compatible.

multiboot2/src/util.rs

@@ -3,7 +3,7 @@
 use core::fmt;
 use core::fmt::{Display, Formatter};
 use core::str::Utf8Error;
-use multiboot2_common::ALIGNMENT;
+use multiboot2_common::{increase_to_alignment, ALIGNMENT};
 #[cfg(feature = "alloc")]
 use {
     crate::{TagHeader, TagTrait},
@@ -91,17 +91,6 @@ pub fn parse_slice_as_string(bytes: &[u8]) -> Result<&str, StringError> {
     cstr.to_str().map_err(StringError::Utf8)
 }
 
-/// Increases the given size to the next alignment boundary, if it is not a
-/// multiple of the alignment yet. This is relevant as in Rust's [type layout],
-/// the allocated size of a type is always a multiple of the alignment, even
-/// if the type is smaller.
-///
-/// [type layout]: https://doc.rust-lang.org/reference/type-layout.html
-pub const fn increase_to_alignment(size: usize) -> usize {
-    let mask = ALIGNMENT - 1;
-    (size + mask) & !mask
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -134,15 +123,6 @@ mod tests {
         assert_eq!(parse_slice_as_string(b"hello\0foo"), Ok("hello"));
     }
 
-    #[test]
-    fn test_increase_to_alignment() {
-        assert_eq!(increase_to_alignment(0), 0);
-        assert_eq!(increase_to_alignment(1), 8);
-        assert_eq!(increase_to_alignment(7), 8);
-        assert_eq!(increase_to_alignment(8), 8);
-        assert_eq!(increase_to_alignment(9), 16);
-    }
-
     #[test]
     #[cfg(feature = "alloc")]
     fn test_new_boxed() {