[major][Rebase & FF] Consolidate alloc crate usage and opt out of alloc feature for patina_internal_cpu's patina sdk dependency

components/patina_acpi/src/acpi.rs

@@ -813,8 +813,6 @@ where
 
 #[cfg(test)]
 mod tests {
-    extern crate std;
-
     use crate::signature::MAX_INITIAL_ENTRIES;
 
     use super::*;

components/patina_acpi/src/service.rs

@@ -168,9 +168,9 @@ pub(crate) trait AcpiProvider {
 #[cfg(test)]
 #[cfg_attr(coverage, coverage(off))]
 mod tests {
-    use alloc::boxed::Box;
     use core::mem;
     use patina::component::service::memory::StdMemoryManager;
+    use std::boxed::Box;
 
     use crate::acpi_table::AcpiFadt;
 

components/patina_adv_logger/src/lib.rs

@@ -8,7 +8,7 @@
 #![deny(missing_docs)]
 #![cfg_attr(coverage, feature(coverage_attribute))]
 
-#[cfg(any(feature = "alloc", test, doc))]
+#[cfg(any(feature = "alloc", doc))]
 extern crate alloc;
 
 mod memory_log;

components/patina_adv_logger/src/logger.rs

@@ -351,7 +351,6 @@ where
 mod tests {
     use core::{ffi::c_void, ptr};
 
-    use alloc::boxed::Box;
     use log::Log;
     use patina::standard::efi;
     use patina::{
@@ -360,6 +359,7 @@ mod tests {
         peripheral::serial::uart::UartNull,
         pi::hob::{GUID_EXTENSION, GuidHob, HobHeader},
     };
+    use std::boxed::Box;
 
     use crate::{
         logger::{AdvancedLogger, TargetFilter},

components/patina_adv_logger/src/memory_log.rs

@@ -423,9 +423,9 @@ impl AdvLoggerMessageEntry {
 const TEST_DATA_SIZE: usize = 128;
 
 #[cfg(test)]
-pub(crate) fn create_buffer_v5(timer_frequency: u64, hw_port_disabled: bool) -> alloc::boxed::Box<[u8]> {
+pub(crate) fn create_buffer_v5(timer_frequency: u64, hw_port_disabled: bool) -> std::boxed::Box<[u8]> {
     let header_size = size_of::<AdvLoggerInfoV5>();
-    let mut buffer = alloc::vec![0_u8; header_size + TEST_DATA_SIZE].into_boxed_slice();
+    let mut buffer = std::vec![0_u8; header_size + TEST_DATA_SIZE].into_boxed_slice();
     let header = AdvLoggerInfoV5 {
         signature: AdvLoggerInfo::SIGNATURE,
         version: ADV_LOGGER_INFO_VERSION_V5,
@@ -457,9 +457,9 @@ pub(crate) fn create_buffer_v5(timer_frequency: u64, hw_port_disabled: bool) ->
 }
 
 #[cfg(test)]
-pub(crate) fn create_buffer_v6(timer_frequency: u64, new_address: u64) -> alloc::boxed::Box<[u8]> {
+pub(crate) fn create_buffer_v6(timer_frequency: u64, new_address: u64) -> std::boxed::Box<[u8]> {
     let header_size = size_of::<AdvLoggerInfoV6>();
-    let mut buffer = alloc::vec![0_u8; header_size + TEST_DATA_SIZE].into_boxed_slice();
+    let mut buffer = std::vec![0_u8; header_size + TEST_DATA_SIZE].into_boxed_slice();
     let header = AdvLoggerInfoV6 {
         v5: AdvLoggerInfoV5 {
             signature: AdvLoggerInfo::SIGNATURE,

components/patina_adv_logger/src/reader.rs

@@ -154,7 +154,6 @@ impl<'a> Iterator for AdvLogIterator<'a> {
 #[cfg(test)]
 #[cfg_attr(coverage, coverage(off))]
 mod tests {
-    extern crate std;
     use core::{mem::size_of, sync::atomic::Ordering};
 
     use super::*;

components/patina_adv_logger/src/writer.rs

@@ -192,10 +192,9 @@ impl AdvancedLogWriter {
 #[cfg(all(test, feature = "reader"))]
 #[cfg_attr(coverage, coverage(off))]
 mod tests {
-    extern crate std;
-    use alloc::boxed::Box;
     use core::{mem::size_of, sync::atomic::Ordering};
     use efi::PhysicalAddress;
+    use std::boxed::Box;
 
     use super::*;
     use crate::{memory_log::*, reader::AdvancedLogReader};

components/patina_mm/src/component/communicator/comm_buffer_update.rs

@@ -277,7 +277,7 @@ mod tests {
     };
     use patina::uefi::boot_services::StandardBootServices;
 
-    use alloc::boxed::Box;
+    use std::boxed::Box;
 
     /// Helper to create a test protocol notify context without boot services
     fn create_test_context(updatable_buffer_id: u8) -> Box<ProtocolNotifyContext> {

components/patina_mm/tests/patina_mm_integration/common/framework.rs

@@ -12,9 +12,8 @@
 //! SPDX-License-Identifier: Apache-2.0
 use crate::patina_mm_integration::common::{constants::*, handlers::*, message_parser::*};
 
-extern crate alloc;
-use alloc::{boxed::Box, string::String, vec::Vec};
 use patina::BinaryGuid;
+use std::{boxed::Box, string::String, vec::Vec};
 use std::{
     collections::HashMap,
     sync::{

components/patina_mm/tests/patina_mm_integration/common/handlers.rs

@@ -19,8 +19,7 @@
 use crate::patina_mm_integration::common::constants::*;
 use patina::standard::efi;
 
-extern crate alloc;
-use alloc::{string::String, vec::Vec};
+use std::{string::String, vec::Vec};
 pub use zerocopy::IntoBytes;
 
 pub use patina::management_mode::protocol::{

components/patina_mm/tests/patina_mm_integration/common/message_parser.rs

@@ -10,9 +10,6 @@
 //!
 //! SPDX-License-Identifier: Apache-2.0
 
-extern crate alloc;
-#[allow(unused_imports)] // Used in test module within this file
-use alloc::vec::Vec;
 use patina::BinaryGuid;
 
 /// Error types for MM message parsing operations

components/patina_mm/tests/patina_mm_integration/common/real_component_framework.rs

@@ -16,12 +16,12 @@
 
 use crate::patina_mm_integration::common::{constants::*, handlers::*};
 
-extern crate alloc;
-use alloc::{boxed::Box, vec::Vec};
 use patina::Guid;
 use std::{
+    boxed::Box,
     collections::BTreeMap,
     sync::{Arc, Mutex},
+    vec::Vec,
 };
 
 // Import the real patina_mm components and services

components/patina_mm/tests/patina_mm_integration/tests_root.rs

@@ -31,8 +31,6 @@
 //!
 //! SPDX-License-Identifier: Apache-2.0
 
-extern crate alloc;
-
 // Common utilities available to all test modules
 mod common;
 

components/patina_performance/src/component/performance.rs

@@ -525,7 +525,6 @@ mod tests {
     };
     use patina::standard::efi;
 
-    use alloc::sync::Arc;
     use patina::{
         c_ptr::{CMutPtr, CPtr},
         component::service::{IntoService, Service},
@@ -537,6 +536,7 @@ mod tests {
         uefi::{boot_services::MockBootServices, runtime_services::MockRuntimeServices},
     };
     use patina_mm::component::communicator::{MmCommunication, Status};
+    use std::sync::Arc;
 
     // Some constants shared between tests
     const TEST_EVENT_HANDLE: efi::Event = 1_usize as efi::Event;
@@ -760,7 +760,7 @@ mod tests {
         boot_services.expect_close_event().once().return_const(Ok(()));
 
         // The component allocates the publishing buffer itself; hand back a real leaked page-sized buffer.
-        let leaked_buffer = Box::leak(alloc::vec![0u8; UEFI_PAGE_SIZE].into_boxed_slice());
+        let leaked_buffer = Box::leak(std::vec![0u8; UEFI_PAGE_SIZE].into_boxed_slice());
         let leaked_buffer_addr = leaked_buffer.as_mut_ptr() as usize;
         boot_services.expect_allocate_pages().once().returning(move |_, _, _| Ok(leaked_buffer_addr));
 

components/patina_samples/src/lib.rs

@@ -15,9 +15,11 @@
 //!
 //! SPDX-License-Identifier: Apache-2.0
 //!
-#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(all(not(feature = "std"), not(test)), no_std)]
 #![deny(missing_docs)]
 #![cfg_attr(coverage, feature(coverage_attribute))]
 #![cfg_attr(coverage, coverage(off))] // Disable all coverage instrumentation for sample code
+extern crate alloc;
+
 pub mod component;
 pub mod smbios_platform;

components/patina_samples/src/smbios_platform.rs

@@ -28,8 +28,6 @@
 //!
 //! SPDX-License-Identifier: Apache-2.0
 
-extern crate alloc;
-
 use alloc::{string::String, vec};
 use patina::{
     component::{component, service::Service},

components/patina_smbios/src/component.rs

@@ -8,7 +8,6 @@
 //!
 //! SPDX-License-Identifier: Apache-2.0
 
-extern crate alloc;
 use crate::{
     error::SmbiosError,
     manager::SmbiosManager,
@@ -143,7 +142,6 @@ impl SmbiosProvider {
 #[cfg(test)]
 mod tests {
     use super::*;
-    extern crate std;
 
     #[test]
     fn test_smbios_provider_new() {

components/patina_smbios/src/error.rs

@@ -121,7 +121,6 @@ mod tests {
 
     #[test]
     fn test_smbios_error_all_variants() {
-        extern crate std;
         use std::vec;
 
         // Test all error variants for completeness

components/patina_smbios/src/lib.rs

@@ -313,6 +313,8 @@
 #![deny(missing_docs)]
 #![cfg_attr(coverage, feature(coverage_attribute))]
 
+extern crate alloc;
+
 // SMBIOS tables require little-endian byte order. The SmbiosRecord derive macro
 // uses zerocopy::IntoBytes::as_bytes() which returns native byte order.
 #[cfg(not(target_endian = "little"))]

components/patina_smbios/src/manager.rs

@@ -12,8 +12,6 @@
 //! SPDX-License-Identifier: Apache-2.0
 //!
 
-extern crate alloc;
-
 use patina::protocol::ProtocolInterface;
 
 mod core;

components/patina_smbios/src/manager/core.rs

@@ -10,8 +10,6 @@
 //! SPDX-License-Identifier: Apache-2.0
 //!
 
-extern crate alloc;
-
 use alloc::{boxed::Box, collections::BTreeSet, string::String, vec::Vec};
 use core::cell::RefCell;
 use patina::standard::efi::{Handle, PhysicalAddress};
@@ -755,14 +753,13 @@ impl SmbiosManager {
 #[cfg(test)]
 mod tests {
     use super::*;
-    extern crate std;
-    use std::{vec, vec::Vec};
-
     use crate::{
         error::SmbiosError,
         service::{SMBIOS_HANDLE_PI_RESERVED, SMBIOS_STRING_MAX_LENGTH, SmbiosHandle, SmbiosTableHeader},
     };
+    use patina::component::service::memory::StdMemoryManager;
     use patina::standard::efi;
+    use std::{boxed::Box, vec, vec::Vec};
     use zerocopy::IntoBytes;
 
     /// Test helper: Build a simple SMBIOS record with the given header and strings
@@ -1771,10 +1768,6 @@ mod tests {
 
     #[test]
     fn test_allocate_buffers() {
-        use patina::component::service::memory::StdMemoryManager;
-        extern crate std;
-        use std::boxed::Box;
-
         let manager = SmbiosManager::new(3, 9).expect("failed to create manager");
         let memory_manager: &'static dyn patina::component::service::memory::MemoryManager =
             Box::leak(Box::new(StdMemoryManager::new()));
@@ -1798,10 +1791,6 @@ mod tests {
 
     #[test]
     fn test_allocate_buffers_idempotent() {
-        use patina::component::service::memory::StdMemoryManager;
-        extern crate std;
-        use std::boxed::Box;
-
         let manager = SmbiosManager::new(3, 9).expect("failed to create manager");
         let memory_manager: &'static dyn patina::component::service::memory::MemoryManager =
             Box::leak(Box::new(StdMemoryManager::new()));
@@ -1822,10 +1811,6 @@ mod tests {
 
     #[test]
     fn test_build_table_data() {
-        use patina::component::service::memory::StdMemoryManager;
-        extern crate std;
-        use std::boxed::Box;
-
         let manager = SmbiosManager::new(3, 9).expect("failed to create manager");
         let memory_manager: &'static dyn patina::component::service::memory::MemoryManager =
             Box::leak(Box::new(StdMemoryManager::new()));
@@ -1865,10 +1850,6 @@ mod tests {
 
     #[test]
     fn test_build_table_data_copies_records_correctly() {
-        use patina::component::service::memory::StdMemoryManager;
-        extern crate std;
-        use std::boxed::Box;
-
         let manager = SmbiosManager::new(3, 9).expect("failed to create manager");
         let memory_manager: &'static dyn patina::component::service::memory::MemoryManager =
             Box::leak(Box::new(StdMemoryManager::new()));
@@ -1899,10 +1880,6 @@ mod tests {
 
     #[test]
     fn test_build_table_data_no_records_error() {
-        use patina::component::service::memory::StdMemoryManager;
-        extern crate std;
-        use std::boxed::Box;
-
         let manager = SmbiosManager::new(3, 9).expect("failed to create manager");
         let memory_manager: &'static dyn patina::component::service::memory::MemoryManager =
             Box::leak(Box::new(StdMemoryManager::new()));

components/patina_smbios/src/manager/protocol.rs

@@ -13,8 +13,6 @@
 //! SPDX-License-Identifier: Apache-2.0
 //!
 
-extern crate alloc;
-
 use core::ffi::c_char;
 
 use alloc::string::ToString;
@@ -360,7 +358,6 @@ impl SmbiosProtocol {
 mod tests {
     use super::*;
     use crate::{error::SmbiosError, manager::SmbiosManager};
-    extern crate std;
     use std::vec::Vec;
 
     fn create_test_bios_info_record() -> Vec<u8> {

components/patina_smbios/src/manager/record.rs

@@ -10,8 +10,6 @@
 //! SPDX-License-Identifier: Apache-2.0
 //!
 
-extern crate alloc;
-
 use alloc::vec::Vec;
 
 use crate::service::SmbiosTableHeader;
@@ -40,7 +38,6 @@ impl SmbiosRecord {
 #[cfg(test)]
 mod tests {
     use super::*;
-    extern crate std;
     use std::vec;
 
     use patina::standard::efi;