From 4129bba79f53315b551cd6fbb6e6892612bb364c Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nbishop@nbishop.net>
Date: Sun, 1 Jan 2023 20:41:47 -0500
Subject: [PATCH 1/2] uefi: Remove commented-out code

`macro_use` isn't required; `use alloc::vec;` should work fine if we need it.
---
 uefi/src/lib.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/uefi/src/lib.rs b/uefi/src/lib.rs
index b44e7b9ea..6d803863e 100644
--- a/uefi/src/lib.rs
+++ b/uefi/src/lib.rs
@@ -68,8 +68,6 @@
 #![deny(clippy::all)]
 #![deny(clippy::must_use_candidate)]
 
-// Enable once we use vec![] or similar
-// #[cfg_attr(feature = "alloc", macro_use)]
 #[cfg(feature = "alloc")]
 extern crate alloc;
 

From 4128922dfe4493ea059a1d4bca606e552128d91c Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nbishop@nbishop.net>
Date: Sun, 1 Jan 2023 20:44:48 -0500
Subject: [PATCH 2/2] Clean up alloc imports

In some places we have `use crate::alloc::...`, which isn't necessary: `use
alloc::...` works fine.
---
 uefi-test-runner/src/boot/memory.rs    | 2 +-
 uefi/src/data_types/owned_strs.rs      | 6 +++---
 uefi/src/data_types/strs.rs            | 2 +-
 uefi/src/data_types/unaligned_slice.rs | 2 +-
 uefi/src/proto/media/file/info.rs      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/uefi-test-runner/src/boot/memory.rs b/uefi-test-runner/src/boot/memory.rs
index b464136e3..1a2dcfaf3 100644
--- a/uefi-test-runner/src/boot/memory.rs
+++ b/uefi-test-runner/src/boot/memory.rs
@@ -1,6 +1,6 @@
 use uefi::table::boot::{AllocateType, BootServices, MemoryType};
 
-use crate::alloc::vec::Vec;
+use alloc::vec::Vec;
 
 pub fn test(bt: &BootServices) {
     info!("Testing memory functions");
diff --git a/uefi/src/data_types/owned_strs.rs b/uefi/src/data_types/owned_strs.rs
index 030ac9a4f..c8d5f5fa4 100644
--- a/uefi/src/data_types/owned_strs.rs
+++ b/uefi/src/data_types/owned_strs.rs
@@ -1,9 +1,9 @@
 use super::chars::{Char16, NUL_16};
 use super::strs::{CStr16, FromSliceWithNulError};
-use crate::alloc::vec::Vec;
 use crate::data_types::strs::EqStrUntilNul;
 use crate::data_types::UnalignedSlice;
 use crate::polyfill::vec_into_raw_parts;
+use alloc::vec::Vec;
 use core::fmt;
 use core::ops;
 
@@ -155,8 +155,8 @@ impl<StrType: AsRef<str> + ?Sized> EqStrUntilNul<StrType> for CString16 {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::alloc::string::String;
-    use crate::alloc::vec;
+    use alloc::string::String;
+    use alloc::vec;
 
     #[test]
     fn test_cstring16_from_str() {
diff --git a/uefi/src/data_types/strs.rs b/uefi/src/data_types/strs.rs
index 68863f83c..3d3bc2359 100644
--- a/uefi/src/data_types/strs.rs
+++ b/uefi/src/data_types/strs.rs
@@ -478,7 +478,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::alloc::string::String;
+    use alloc::string::String;
     use uefi_macros::{cstr16, cstr8};
 
     // Tests if our CStr8 type can be constructed from a valid core::ffi::CStr
diff --git a/uefi/src/data_types/unaligned_slice.rs b/uefi/src/data_types/unaligned_slice.rs
index f18455e01..7ccd7fc00 100644
--- a/uefi/src/data_types/unaligned_slice.rs
+++ b/uefi/src/data_types/unaligned_slice.rs
@@ -3,7 +3,7 @@ use core::marker::PhantomData;
 use core::mem::MaybeUninit;
 
 #[cfg(feature = "alloc")]
-use crate::alloc::vec::Vec;
+use alloc::vec::Vec;
 
 /// Slice backed by a potentially-unaligned pointer.
 ///
diff --git a/uefi/src/proto/media/file/info.rs b/uefi/src/proto/media/file/info.rs
index acde2831b..def93dd58 100644
--- a/uefi/src/proto/media/file/info.rs
+++ b/uefi/src/proto/media/file/info.rs
@@ -398,10 +398,10 @@ impl FileProtocolInfo for FileSystemVolumeLabel {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::alloc::vec;
     use crate::table::runtime::TimeParams;
     use crate::table::runtime::{Daylight, Time};
     use crate::CString16;
+    use alloc::vec;
 
     fn validate_layout<T: InfoInternal + ?Sized>(info: &T, name: &[Char16]) {
         // Check the hardcoded struct alignment.