Skip to content

Commit 96b27c7

Browse files
authored
Merge pull request #1417 from nicholasbishop/bishop-more-bt-cleanup-2
uefi: Delete the deprecated `uefi::table::{boot,system}` modules
2 parents 14a0d14 + b9c4944 commit 96b27c7

File tree

6 files changed

+8
-1671
lines changed

6 files changed

+8
-1671
lines changed

uefi/CHANGELOG.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ See [Deprecating SystemTable/BootServices/RuntimeServices][funcmigrate] for
44
details of the deprecated items that were removed in this release.
55

66
## Changed
7-
- **Breaking:** Deleted the deprecated `RuntimeServices` struct.
7+
- **Breaking:** Deleted the deprecated `BootServices`, `RuntimeServices`, and
8+
`SystemTable` structs.
89
- **Breaking:** Deleted deprecated functions `allocator::init`,
9-
`allocator::exit_boot_services`, `helpers::system_table`, and
10-
`table::system_table_runtime`.
10+
`allocator::exit_boot_services`, `helpers::system_table`,
11+
`table::system_table_boot`, and `table::system_table_runtime`.
1112
- **Breaking:** `FileSystem` no longer has a lifetime parameter, and the
1213
deprecated conversion from `uefi::table::boot::ScopedProtocol` has been
1314
removed.

uefi/src/prelude.rs

-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,3 @@
55
pub use crate::{
66
boot, cstr16, cstr8, entry, runtime, system, Handle, ResultExt, Status, StatusExt,
77
};
8-
9-
// Import the basic table types.
10-
#[allow(deprecated)]
11-
pub use crate::table::boot::BootServices;
12-
#[allow(deprecated)]
13-
pub use crate::table::{Boot, SystemTable};

uefi/src/proto/security/memory_protection.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl MemoryProtection {
2929
/// [`EXECUTE_PROTECT`]: MemoryAttribute::EXECUTE_PROTECT
3030
/// [`READ_ONLY`]: MemoryAttribute::READ_ONLY
3131
/// [`Status::NO_MAPPING`]: crate::Status::NO_MAPPING
32-
/// [UEFI page size]: uefi::table::boot::PAGE_SIZE
32+
/// [UEFI page size]: uefi::boot::PAGE_SIZE
3333
pub fn get_memory_attributes(
3434
&self,
3535
byte_region: Range<PhysicalAddress>,
@@ -53,7 +53,7 @@ impl MemoryProtection {
5353
/// [`READ_PROTECT`]: MemoryAttribute::READ_PROTECT
5454
/// [`EXECUTE_PROTECT`]: MemoryAttribute::EXECUTE_PROTECT
5555
/// [`READ_ONLY`]: MemoryAttribute::READ_ONLY
56-
/// [UEFI page size]: uefi::table::boot::PAGE_SIZE
56+
/// [UEFI page size]: uefi::boot::PAGE_SIZE
5757
pub fn set_memory_attributes(
5858
&self,
5959
byte_region: Range<PhysicalAddress>,
@@ -76,7 +76,7 @@ impl MemoryProtection {
7676
/// [`READ_PROTECT`]: MemoryAttribute::READ_PROTECT
7777
/// [`EXECUTE_PROTECT`]: MemoryAttribute::EXECUTE_PROTECT
7878
/// [`READ_ONLY`]: MemoryAttribute::READ_ONLY
79-
/// [UEFI page size]: uefi::table::boot::PAGE_SIZE
79+
/// [UEFI page size]: uefi::boot::PAGE_SIZE
8080
pub fn clear_memory_attributes(
8181
&self,
8282
byte_region: Range<PhysicalAddress>,

0 commit comments

Comments
 (0)