@@ -21,15 +21,15 @@ use derive_more::Display;
2121pub enum MbiLoadError {
2222 /// The address is invalid. Make sure that the address is 8-byte aligned,
2323/// according to the spec.
24- #[ display( "The address is invalid" ) ]
24+ #[ display( fmt = "The address is invalid" ) ]
2525 IllegalAddress ,
2626 /// The total size of the multiboot2 information structure must be not zero
2727/// and a multiple of 8.
28- #[ display( "The size of the MBI is unexpected" ) ]
28+ #[ display( fmt = "The size of the MBI is unexpected" ) ]
2929 IllegalTotalSize ( u32 ) ,
3030 /// Missing end tag. Each multiboot2 boot information requires to have an
3131/// end tag.
32- #[ display( "There is no end tag" ) ]
32+ #[ display( fmt = "There is no end tag" ) ]
3333 NoEndTag ,
3434}
3535
@@ -38,7 +38,7 @@ impl core::error::Error for MbiLoadError {}
3838
3939/// The basic header of a [`BootInformation`] as sized Rust type.
4040#[ derive( Copy , Clone , Debug , PartialEq , Eq , PartialOrd , Ord , Hash ) ]
41- #[ repr( C ) ]
41+ #[ repr( C , align ( 8 ) ) ]
4242pub struct BootInformationHeader {
4343 // size is multiple of 8
4444 total_size : u32 ,
@@ -68,7 +68,7 @@ impl AsBytes for BootInformationHeader {}
6868/// This type holds the whole data of the MBI. This helps to better satisfy miri
6969/// when it checks for memory issues.
7070#[ derive( ptr_meta:: Pointee ) ]
71- #[ repr( C ) ]
71+ #[ repr( C , align ( 8 ) ) ]
7272struct BootInformationInner {
7373 header : BootInformationHeader ,
7474 tags : [ u8 ] ,
@@ -221,6 +221,8 @@ impl<'a> BootInformation<'a> {
221221/// Otherwise, if the [`TagType::EfiBs`] tag is present, this returns `None`
222222/// as it is strictly recommended to get the memory map from the `uefi`
223223/// services.
224+ ///
225+ /// [`TagType::EfiBs`]: crate::TagType::EfiBs
224226#[ must_use]
225227 pub fn efi_memory_map_tag ( & self ) -> Option < & EFIMemoryMapTag > {
226228 // If the EFIBootServicesNotExited is present, then we should not use
@@ -277,8 +279,8 @@ impl<'a> BootInformation<'a> {
277279 pub fn elf_sections ( & self ) -> Option < ElfSectionIter > {
278280 let tag = self . get_tag :: < ElfSectionsTag > ( ) ;
279281 tag. map ( |t| {
280- assert ! ( ( t. entry_size * t. shndx) <= t. size) ;
281- t. sections ( )
282+ assert ! ( ( t. entry_size( ) * t. shndx( ) ) <= t. size( ) as u32 ) ;
283+ t. sections_iter ( )
282284 } )
283285 }
284286
@@ -359,7 +361,7 @@ impl<'a> BootInformation<'a> {
359361/// special handling is required. This is reflected by code-comments.
360362///
361363/// ```no_run
362- /// use multiboot2::{BootInformation, BootInformationHeader, StringError, Tag , TagTrait, TagType, TagTypeId};
364+ /// use multiboot2::{BootInformation, BootInformationHeader, parse_slice_as_string, StringError, TagHeader , TagTrait, TagType, TagTypeId};
363365///
364366/// #[repr(C)]
365367/// #[derive(multiboot2::Pointee)] // Only needed for DSTs.
@@ -374,17 +376,17 @@ impl<'a> BootInformation<'a> {
374376/// impl TagTrait for CustomTag {
375377/// const ID: TagType = TagType::Custom(0x1337);
376378///
377- /// fn dst_size(base_tag : &Tag ) -> usize {
379+ /// fn dst_len(header : &TagHeader ) -> usize {
378380/// // The size of the sized portion of the custom tag.
379381/// let tag_base_size = 8; // id + size is 8 byte in size
380- /// assert!(base_tag .size >= 8);
381- /// base_tag .size as usize - tag_base_size
382+ /// assert!(header .size >= 8);
383+ /// header .size as usize - tag_base_size
382384/// }
383385/// }
384386///
385387/// impl CustomTag {
386388/// fn name(&self) -> Result<&str, StringError> {
387- /// Tag:: parse_slice_as_string(&self.name)
389+ /// parse_slice_as_string(&self.name)
388390/// }
389391/// }
390392/// let mbi_ptr = 0xdeadbeef as *const BootInformationHeader;
@@ -395,11 +397,13 @@ impl<'a> BootInformation<'a> {
395397/// .unwrap();
396398/// assert_eq!(tag.name(), Ok("name"));
397399/// ```
400+ ///
401+ /// [`TagType`]: crate::TagType
398402#[ must_use]
399403 pub fn get_tag < TagT : TagTrait + ?Sized + ' a > ( & ' a self ) -> Option < & ' a TagT > {
400404 self . tags ( )
401- . find ( |tag| tag. typ == TagT :: ID )
402- . map ( |tag| tag. cast_tag :: < TagT > ( ) )
405+ . find ( |tag| tag. header ( ) . typ == TagT :: ID )
406+ . map ( |tag| tag. cast :: < TagT > ( ) )
403407 }
404408
405409 /// Returns an iterator over all tags.
@@ -440,7 +444,7 @@ impl fmt::Debug for BootInformation<'_> {
440444 if elf_sections_tag_entries_count > ELF_SECTIONS_LIMIT {
441445 debug. field ( "elf_sections (count)" , & elf_sections_tag_entries_count) ;
442446 } else {
443- debug. field ( "elf_sections" , & self . elf_sections ( ) . unwrap_or_default ( ) ) ;
447+ debug. field ( "elf_sections" , & self . elf_sections ( ) ) ;
444448 }
445449 }
446450
0 commit comments