Skip to content

Commit 02fe305

Browse files
committed
multiboot2: consume multiboot2-common (2/N): test utils
1 parent 7ab7103 commit 02fe305

File tree

7 files changed

+6
-95
lines changed

7 files changed

+6
-95
lines changed

multiboot2/src/boot_loader_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ impl TagTrait for BootLoaderNameTag {
8888
mod tests {
8989
use super::*;
9090
use crate::tag::{GenericTag, TagBytesRef};
91-
use crate::test_util::AlignedBytes;
9291
use core::borrow::Borrow;
92+
use multiboot2_common::test_utils::AlignedBytes;
9393

9494
#[rustfmt::skip]
9595
fn get_bytes() -> AlignedBytes<16> {

multiboot2/src/command_line.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ impl TagTrait for CommandLineTag {
8282
mod tests {
8383
use super::*;
8484
use crate::tag::{GenericTag, TagBytesRef};
85-
use crate::test_util::AlignedBytes;
8685
use core::borrow::Borrow;
86+
use multiboot2_common::test_utils::AlignedBytes;
8787

8888
#[rustfmt::skip]
8989
fn get_bytes() -> AlignedBytes<16> {

multiboot2/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ extern crate bitflags;
5656

5757
#[cfg(feature = "builder")]
5858
pub mod builder;
59-
#[cfg(test)]
60-
pub(crate) mod test_util;
6159

6260
mod boot_information;
6361
mod boot_loader_name;
@@ -116,7 +114,7 @@ pub const MAGIC: u32 = 0x36d76289;
116114
#[cfg(test)]
117115
mod tests {
118116
use super::*;
119-
use crate::test_util::AlignedBytes;
117+
use multiboot2_common::test_utils::AlignedBytes;
120118

121119
/// Compile time test to check if the boot information is Send and Sync.
122120
/// This test is relevant to give library users flexebility in passing the

multiboot2/src/module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ impl<'a> Debug for ModuleIter<'a> {
129129
mod tests {
130130
use super::*;
131131
use crate::tag::{GenericTag, TagBytesRef};
132-
use crate::test_util::AlignedBytes;
133132
use core::borrow::Borrow;
133+
use multiboot2_common::test_utils::AlignedBytes;
134134

135135
#[rustfmt::skip]
136136
fn get_bytes() -> AlignedBytes<24> {

multiboot2/src/smbios.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ impl Debug for SmbiosTag {
7272
mod tests {
7373
use super::*;
7474
use crate::tag::{GenericTag, TagBytesRef};
75-
use crate::test_util::AlignedBytes;
7675
use core::borrow::Borrow;
76+
use multiboot2_common::test_utils::AlignedBytes;
7777

7878
#[rustfmt::skip]
7979
fn get_bytes() -> AlignedBytes<32> {

multiboot2/src/tag.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,9 @@ impl<'a> Iterator for TagIter<'a> {
237237
#[cfg(test)]
238238
mod tests {
239239
use super::*;
240-
use crate::test_util::AlignedBytes;
241240
use core::borrow::Borrow;
242241
use core::mem;
242+
use multiboot2_common::test_utils::AlignedBytes;
243243

244244
#[test]
245245
fn test_new_generic_tag() {

multiboot2/src/test_util.rs

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)