Merge pull request rust-osdev#1417 from nicholasbishop/bishop-more-bt…

…-cleanup-2 uefi: Delete the deprecated `uefi::table::{boot,system}` modules
nicholasbishop · Oct 1, 2024 · 96b27c7 · 96b27c7
2 parents 14a0d14 + b9c4944
commit 96b27c7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 1,671 deletions.
diff --git a/uefi/CHANGELOG.md b/uefi/CHANGELOG.md
@@ -4,10 +4,11 @@ See [Deprecating SystemTable/BootServices/RuntimeServices][funcmigrate] for
 details of the deprecated items that were removed in this release.
 
 ## Changed
-- **Breaking:** Deleted the deprecated `RuntimeServices` struct.
+- **Breaking:** Deleted the deprecated `BootServices`, `RuntimeServices`, and
+  `SystemTable` structs.
 - **Breaking:** Deleted deprecated functions `allocator::init`,
-  `allocator::exit_boot_services`, `helpers::system_table`, and
-  `table::system_table_runtime`.
+  `allocator::exit_boot_services`, `helpers::system_table`,
+  `table::system_table_boot`, and `table::system_table_runtime`.
 - **Breaking:** `FileSystem` no longer has a lifetime parameter, and the
   deprecated conversion from `uefi::table::boot::ScopedProtocol` has been
   removed.

diff --git a/uefi/src/prelude.rs b/uefi/src/prelude.rs
@@ -5,9 +5,3 @@
 pub use crate::{
     boot, cstr16, cstr8, entry, runtime, system, Handle, ResultExt, Status, StatusExt,
 };
-
-// Import the basic table types.
-#[allow(deprecated)]
-pub use crate::table::boot::BootServices;
-#[allow(deprecated)]
-pub use crate::table::{Boot, SystemTable};
diff --git a/uefi/src/proto/security/memory_protection.rs b/uefi/src/proto/security/memory_protection.rs
@@ -29,7 +29,7 @@ impl MemoryProtection {
     /// [`EXECUTE_PROTECT`]: MemoryAttribute::EXECUTE_PROTECT
     /// [`READ_ONLY`]: MemoryAttribute::READ_ONLY
     /// [`Status::NO_MAPPING`]: crate::Status::NO_MAPPING
-    /// [UEFI page size]: uefi::table::boot::PAGE_SIZE
+    /// [UEFI page size]: uefi::boot::PAGE_SIZE
     pub fn get_memory_attributes(
         &self,
         byte_region: Range<PhysicalAddress>,
@@ -53,7 +53,7 @@ impl MemoryProtection {
     /// [`READ_PROTECT`]: MemoryAttribute::READ_PROTECT
     /// [`EXECUTE_PROTECT`]: MemoryAttribute::EXECUTE_PROTECT
     /// [`READ_ONLY`]: MemoryAttribute::READ_ONLY
-    /// [UEFI page size]: uefi::table::boot::PAGE_SIZE
+    /// [UEFI page size]: uefi::boot::PAGE_SIZE
     pub fn set_memory_attributes(
         &self,
         byte_region: Range<PhysicalAddress>,
@@ -76,7 +76,7 @@ impl MemoryProtection {
     /// [`READ_PROTECT`]: MemoryAttribute::READ_PROTECT
     /// [`EXECUTE_PROTECT`]: MemoryAttribute::EXECUTE_PROTECT
     /// [`READ_ONLY`]: MemoryAttribute::READ_ONLY
-    /// [UEFI page size]: uefi::table::boot::PAGE_SIZE
+    /// [UEFI page size]: uefi::boot::PAGE_SIZE
     pub fn clear_memory_attributes(
         &self,
         byte_region: Range<PhysicalAddress>,