From d478e100b880da324c15cb397b28539e6a6ed167 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@google.com>
Date: Thu, 29 Aug 2024 13:05:39 -0400
Subject: [PATCH] uefi: Deprecate SystemTableView, Boot, and Runtime

---
 uefi/CHANGELOG.md        | 5 +++--
 uefi/src/table/system.rs | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/uefi/CHANGELOG.md b/uefi/CHANGELOG.md
index c723046fe..bca63668d 100644
--- a/uefi/CHANGELOG.md
+++ b/uefi/CHANGELOG.md
@@ -12,8 +12,9 @@ how to integrate the `uefi` crate into them.
 
 ## Changed
 - The `BootServices`, `RuntimeServices`, and `SystemTable` structs have been
-  deprecated. Use the `uefi::boot` and `uefi::runtime`, and `uefi::system`
-  modules instead.
+  deprecated (as well as related types `Boot`, `Runtime`, and
+  `SystemTableView`). Use the `uefi::boot` and `uefi::runtime`, and
+  `uefi::system` modules instead.
 - In `uefi::table::boot`, `ScopedProtocol`, `TplGuard`, `ProtocolsPerHandle`,
   and `HandleBuffer` have been deprecated. Use the structs of the same name in
   `uefi::boot` instead.
diff --git a/uefi/src/table/system.rs b/uefi/src/table/system.rs
index 6896bae39..9fc0b8054 100644
--- a/uefi/src/table/system.rs
+++ b/uefi/src/table/system.rs
@@ -14,14 +14,17 @@ use uefi::mem::memory_map::{
 };
 
 /// Marker trait used to provide different views of the UEFI System Table.
+#[deprecated = "Use the uefi::system, uefi::boot, and uefi::runtime modules instead. See https://github.com/rust-osdev/uefi-rs/blob/HEAD/docs/funcs_migration.md"]
 pub trait SystemTableView {}
 
 /// Marker struct associated with the boot view of the UEFI System Table.
+#[deprecated = "Use the uefi::boot module instead. See https://github.com/rust-osdev/uefi-rs/blob/HEAD/docs/funcs_migration.md"]
 #[derive(Debug)]
 pub struct Boot;
 impl SystemTableView for Boot {}
 
 /// Marker struct associated with the run-time view of the UEFI System Table.
+#[deprecated = "Use the uefi::runtime module instead. See https://github.com/rust-osdev/uefi-rs/blob/HEAD/docs/funcs_migration.md"]
 #[derive(Debug)]
 pub struct Runtime;
 impl SystemTableView for Runtime {}