uefi: Clean up macro imports

All of the macros from uefi_macros are imported into the uefi
crate. Consistently use those imports everywhere, rather than reimporting from
`uefi_macros`.

Author: nicholasbishop

uefi/src/data_types/strs.rs

@@ -620,8 +620,8 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::{cstr16, cstr8};
     use alloc::string::String;
-    use uefi_macros::{cstr16, cstr8};
 
     // Tests if our CStr8 type can be constructed from a valid core::ffi::CStr
     #[test]

uefi/src/fs/dir_entry_iter.rs

@@ -1,9 +1,8 @@
 //! Module for directory iteration. See [`UefiDirectoryIter`].
 
 use super::*;
-use crate::{CStr16, Result};
+use crate::{cstr16, CStr16, Result};
 use alloc::boxed::Box;
-use uefi_macros::cstr16;
 
 /// Common skip dirs in UEFI/FAT-style file systems.
 pub const COMMON_SKIP_DIRS: &[&CStr16] = &[cstr16!("."), cstr16!("..")];

uefi/src/fs/mod.rs

@@ -47,7 +47,7 @@
 //! There is no automatic synchronization of the file system for concurrent
 //! accesses. This is in the responsibility of the user.
 //!
-//! [`cstr16!`]: uefi_macros::cstr16
+//! [`cstr16!`]: crate::cstr16
 
 mod dir_entry_iter;
 mod file_system;

uefi/src/fs/path/mod.rs

@@ -21,15 +21,15 @@ pub use path::{Components, Path};
 pub use pathbuf::PathBuf;
 
 use crate::data_types::chars::NUL_16;
-use crate::{CStr16, Char16};
+use crate::{cstr16, CStr16, Char16};
 pub(super) use validation::validate_path;
 pub use validation::PathError;
 
 /// The default separator for paths.
 pub const SEPARATOR: Char16 = unsafe { Char16::from_u16_unchecked('\\' as u16) };
 
 /// Stringified version of [`SEPARATOR`].
-pub const SEPARATOR_STR: &CStr16 = uefi_macros::cstr16!("\\");
+pub const SEPARATOR_STR: &CStr16 = cstr16!("\\");
 
 /// Deny list of characters for path components. UEFI supports FAT-like file
 /// systems. According to <https://en.wikipedia.org/wiki/Comparison_of_file_systems>,

uefi/src/fs/path/path.rs

@@ -198,8 +198,8 @@ mod convenience_impls {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::cstr16;
     use alloc::vec::Vec;
-    use uefi_macros::cstr16;
 
     #[test]
     fn from_cstr16() {

uefi/src/fs/path/pathbuf.rs

@@ -120,8 +120,8 @@ mod convenience_impls {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::cstr16;
     use alloc::string::ToString;
-    use uefi_macros::cstr16;
 
     #[test]
     fn from_cstr16() {

uefi/src/fs/path/validation.rs

@@ -67,8 +67,7 @@ pub fn validate_path<P: AsRef<Path>>(path: P) -> Result<(), PathError> {
 mod tests {
     use super::*;
     use crate::fs::PathBuf;
-    use crate::CString16;
-    use uefi_macros::cstr16;
+    use crate::{cstr16, CString16};
 
     #[test]
     fn test_validate_path() {

uefi/src/lib.rs

@@ -139,7 +139,7 @@ mod util;
 // Crates that create procedural macros can't unit test the macros they export.
 // Therefore, we do some tests here.
 mod macro_tests {
-    use uefi_macros::{cstr16, cstr8};
+    use crate::{cstr16, cstr8};
 
     #[test]
     fn cstr8_macro_literal() {

uefi/src/prelude.rs

@@ -2,12 +2,9 @@
 //!
 //! This includes the system table types, `Status` codes, etc.
 
-pub use crate::{Handle, ResultExt, Status, StatusExt};
+pub use crate::{cstr16, cstr8, entry, Handle, ResultExt, Status, StatusExt};
 
 // Import the basic table types.
 pub use crate::table::boot::BootServices;
 pub use crate::table::runtime::RuntimeServices;
 pub use crate::table::{Boot, SystemTable};
-
-// Import the macro for creating the custom entry point, as well as the cstr macros.
-pub use uefi_macros::{cstr16, cstr8, entry};

uefi/src/proto/network/snp.rs

@@ -9,12 +9,12 @@
 
 use super::{IpAddress, MacAddress};
 use crate::data_types::Event;
+use crate::proto::unsafe_protocol;
 use crate::{Result, Status, StatusExt};
 use bitflags::bitflags;
 use core::ffi::c_void;
 use core::ptr;
 use core::ptr::NonNull;
-use uefi_macros::unsafe_protocol;
 
 /// The Simple Network Protocol
 #[derive(Debug)]

uefi/src/table/boot.rs

@@ -95,9 +95,9 @@ impl BootServices {
     /// Update the global image [`Handle`].
     ///
     /// This is called automatically in the `main` entry point as part
-    /// of [`uefi_macros::entry`]. It should not be called at any other
+    /// of [`uefi::entry`]. It should not be called at any other
     /// point in time, unless the executable does not use
-    /// [`uefi_macros::entry`], in which case it should be called once
+    /// [`uefi::entry`], in which case it should be called once
     /// before calling other `BootServices` functions.
     ///
     /// # Safety