Skip to content

Commit 0da58fe

Browse files
committed
fmt: reformat for 2024 style edition
1 parent 166e97e commit 0da58fe

File tree

13 files changed

+19
-15
lines changed

13 files changed

+19
-15
lines changed

multiboot2-common/src/boxed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Module for [`new_boxed`].
22
3-
use crate::{increase_to_alignment, Header, MaybeDynSized, ALIGNMENT};
3+
use crate::{ALIGNMENT, Header, MaybeDynSized, increase_to_alignment};
44
use alloc::boxed::Box;
55
use core::alloc::Layout;
66
use core::mem;
@@ -88,8 +88,8 @@ pub fn clone_dyn<T: MaybeDynSized<Metadata = usize> + ?Sized>(tag: &T) -> Box<T>
8888
#[cfg(test)]
8989
mod tests {
9090
use super::*;
91-
use crate::test_utils::{DummyDstTag, DummyTestHeader};
9291
use crate::Tag;
92+
use crate::test_utils::{DummyDstTag, DummyTestHeader};
9393

9494
#[test]
9595
fn test_new_boxed() {

multiboot2-common/src/bytes_ref.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Module for [`BytesRef`].
22
3-
use crate::{Header, MemoryError, ALIGNMENT};
3+
use crate::{ALIGNMENT, Header, MemoryError};
44
use core::marker::PhantomData;
55
use core::mem;
66
use core::ops::Deref;

multiboot2-common/src/iter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! Multiboot2 information tags and iterating Multiboot2 header tags is the
33
//! same.
44
5-
use crate::{increase_to_alignment, DynSizedStructure, Header, ALIGNMENT};
5+
use crate::{ALIGNMENT, DynSizedStructure, Header, increase_to_alignment};
66
use core::marker::PhantomData;
77
use core::mem;
88

@@ -86,8 +86,8 @@ impl<'a, H: Header + 'a> Iterator for TagIter<'a, H> {
8686

8787
#[cfg(test)]
8888
mod tests {
89-
use crate::test_utils::{AlignedBytes, DummyTestHeader};
9089
use crate::TagIter;
90+
use crate::test_utils::{AlignedBytes, DummyTestHeader};
9191
use core::borrow::Borrow;
9292

9393
#[test]

multiboot2-header/src/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{
77
};
88
use alloc::boxed::Box;
99
use alloc::vec::Vec;
10-
use multiboot2_common::{new_boxed, DynSizedStructure, MaybeDynSized};
10+
use multiboot2_common::{DynSizedStructure, MaybeDynSized, new_boxed};
1111

1212
/// Builder for a Multiboot2 header information.
1313
#[derive(Debug)]

multiboot2/src/boot_loader_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Module for [`BootLoaderNameTag`].
22
33
use crate::tag::TagHeader;
4-
use crate::{parse_slice_as_string, StringError, TagType};
4+
use crate::{StringError, TagType, parse_slice_as_string};
55
use core::fmt::{Debug, Formatter};
66
use core::mem;
77
use multiboot2_common::{MaybeDynSized, Tag};

multiboot2/src/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::{
1111
};
1212
use alloc::boxed::Box;
1313
use alloc::vec::Vec;
14-
use multiboot2_common::{new_boxed, DynSizedStructure, MaybeDynSized};
14+
use multiboot2_common::{DynSizedStructure, MaybeDynSized, new_boxed};
1515

1616
/// Builder for a Multiboot2 header information.
1717
// #[derive(Debug)]

multiboot2/src/command_line.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Module for [`CommandLineTag`].
22
33
use crate::tag::TagHeader;
4-
use crate::{parse_slice_as_string, StringError, TagType};
4+
use crate::{StringError, TagType, parse_slice_as_string};
55
use core::fmt::{Debug, Formatter};
66
use core::mem;
77
use core::str;

multiboot2/src/efi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//! - [`EFIImageHandle64Tag`]
77
//! - [`EFIBootServicesNotExitedTag`]
88
9-
use crate::tag::TagHeader;
109
use crate::TagType;
10+
use crate::tag::TagHeader;
1111
use core::mem::size_of;
1212
use multiboot2_common::{MaybeDynSized, Tag};
1313

multiboot2/src/image_load_addr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Module for [`ImageLoadPhysAddrTag`].
22
3-
use crate::tag::TagHeader;
43
use crate::TagType;
4+
use crate::tag::TagHeader;
55
#[cfg(feature = "builder")]
66
use core::mem::size_of;
77
use multiboot2_common::{MaybeDynSized, Tag};

multiboot2/src/memory_map.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,11 @@ impl<'a> EFIMemoryAreaIter<'a> {
422422
fn new(mmap_tag: &'a EFIMemoryMapTag) -> Self {
423423
let desc_size = mmap_tag.desc_size as usize;
424424
let mmap_len = mmap_tag.memory_map.len();
425-
assert_eq!(mmap_len % desc_size, 0, "memory map length must be a multiple of `desc_size` by definition. The MBI seems to be corrupt.");
425+
assert_eq!(
426+
mmap_len % desc_size,
427+
0,
428+
"memory map length must be a multiple of `desc_size` by definition. The MBI seems to be corrupt."
429+
);
426430
Self {
427431
mmap_tag,
428432
i: 0,

multiboot2/src/module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Module for [`ModuleTag`].
22
33
use crate::tag::TagHeader;
4-
use crate::{parse_slice_as_string, StringError, TagIter, TagType};
4+
use crate::{StringError, TagIter, TagType, parse_slice_as_string};
55
use core::fmt::{Debug, Formatter};
66
use core::mem;
77
use multiboot2_common::{MaybeDynSized, Tag};

multiboot2/src/rsdp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
//! signature should be manually verified.
1313
//!
1414
15-
use crate::tag::TagHeader;
1615
use crate::TagType;
16+
use crate::tag::TagHeader;
1717
#[cfg(feature = "builder")]
1818
use core::mem::size_of;
1919
use core::slice;

multiboot2/src/smbios.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Module for [`SmbiosTag`].
22
3-
use crate::tag::TagHeader;
43
use crate::TagType;
4+
use crate::tag::TagHeader;
55
use core::fmt::Debug;
66
use core::mem;
77
use multiboot2_common::{MaybeDynSized, Tag};

0 commit comments

Comments
 (0)