Skip to content

Commit 13fde52

Browse files
authored
Merge pull request #1386 from nicholasbishop/bishop-import-cleanup1
uefi: Clean up imports of uefi::table::runtime
2 parents e7b3118 + 3cd79c1 commit 13fde52

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

uefi/src/boot.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
//!
2020
//! [`proto`]: crate::proto
2121
22-
pub use uefi_raw::table::boot::{EventType, MemoryAttribute, MemoryDescriptor, MemoryType, Tpl, PAGE_SIZE};
22+
pub use uefi_raw::table::boot::{
23+
EventType, MemoryAttribute, MemoryDescriptor, MemoryType, Tpl, PAGE_SIZE,
24+
};
2325

2426
use crate::data_types::PhysicalAddress;
2527
use crate::mem::memory_map::{MemoryMapBackingMemory, MemoryMapKey, MemoryMapMeta, MemoryMapOwned};

uefi/src/proto/media/file/info.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::FileAttribute;
22
use crate::data_types::Align;
3-
use crate::table::runtime::Time;
3+
use crate::runtime::Time;
44
use crate::{CStr16, Char16, Guid, Identify};
55
use core::ffi::c_void;
66
use core::fmt::{self, Display, Formatter};
@@ -426,7 +426,7 @@ impl FileProtocolInfo for FileSystemVolumeLabel {}
426426
#[cfg(test)]
427427
mod tests {
428428
use super::*;
429-
use crate::table::runtime::{Daylight, Time, TimeParams};
429+
use crate::runtime::{Daylight, Time, TimeParams};
430430
use crate::CString16;
431431
use alloc::vec;
432432

uefi/src/proto/media/file/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ pub enum FileMode {
348348
#[cfg(test)]
349349
mod tests {
350350
use super::*;
351-
use crate::table::runtime::Time;
351+
use crate::runtime::Time;
352352
use crate::{CString16, Guid, Identify};
353353
use ::alloc::vec;
354354
use uefi_raw::protocol::file_system::FileProtocolRevision;

0 commit comments

Comments
 (0)