From e044b73a07572ba397d33e68526caa148e6c6c1c Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nbishop@nbishop.net>
Date: Tue, 20 Jun 2023 20:33:23 -0400
Subject: [PATCH] Bump uefi version

---
 Cargo.lock               | 36 +++++-------------------------------
 book/src/tutorial/app.md |  2 +-
 template/Cargo.toml      |  2 +-
 uefi-macros/Cargo.toml   |  2 +-
 uefi-services/Cargo.toml |  2 +-
 5 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2a6bb4385..e5ffce564 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -831,21 +831,6 @@ dependencies = [
  "bit_field",
 ]
 
-[[package]]
-name = "uefi"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c66321e9355bcd547e25268acd230530cb17a1569ec0ed142237f3967075dcd"
-dependencies = [
- "bitflags 2.3.1",
- "log",
- "ptr_meta",
- "ucs2",
- "uefi-macros",
- "uefi-raw 0.2.0",
- "uguid",
-]
-
 [[package]]
 name = "uefi"
 version = "0.24.0"
@@ -855,7 +840,7 @@ dependencies = [
  "ptr_meta",
  "ucs2",
  "uefi-macros",
- "uefi-raw 0.3.0",
+ "uefi-raw",
  "uguid",
 ]
 
@@ -867,18 +852,7 @@ dependencies = [
  "quote",
  "syn 2.0.15",
  "trybuild",
- "uefi 0.23.0",
-]
-
-[[package]]
-name = "uefi-raw"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d73e08d8e944b7c7e90a7c8a53213bdd71ceb7b414ee664f522c1cc579888c25"
-dependencies = [
- "bitflags 2.3.1",
- "ptr_meta",
- "uguid",
+ "uefi",
 ]
 
 [[package]]
@@ -897,7 +871,7 @@ dependencies = [
  "cfg-if",
  "log",
  "qemu-exit",
- "uefi 0.23.0",
+ "uefi",
 ]
 
 [[package]]
@@ -906,7 +880,7 @@ version = "0.2.0"
 dependencies = [
  "log",
  "qemu-exit",
- "uefi 0.24.0",
+ "uefi",
  "uefi-services",
 ]
 
@@ -914,7 +888,7 @@ dependencies = [
 name = "uefi_app"
 version = "0.1.0"
 dependencies = [
- "uefi 0.23.0",
+ "uefi",
  "uefi-services",
 ]
 
diff --git a/book/src/tutorial/app.md b/book/src/tutorial/app.md
index 5f333c345..7eae6e15a 100644
--- a/book/src/tutorial/app.md
+++ b/book/src/tutorial/app.md
@@ -18,7 +18,7 @@ In `cargo.toml`, add a few dependencies:
 ```toml
 [dependencies]
 log = "0.4"
-uefi = "0.23"
+uefi = "0.24"
 uefi-services = "0.20"
 ```
 
diff --git a/template/Cargo.toml b/template/Cargo.toml
index b6026772c..e69090a7e 100644
--- a/template/Cargo.toml
+++ b/template/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
-uefi = { version = "0.23.0", features = ["alloc"] }
+uefi = { version = "0.24.0", features = ["alloc"] }
 uefi-services = "0.20.0"
diff --git a/uefi-macros/Cargo.toml b/uefi-macros/Cargo.toml
index 4027b50e6..d5e4cd5e3 100644
--- a/uefi-macros/Cargo.toml
+++ b/uefi-macros/Cargo.toml
@@ -22,4 +22,4 @@ syn = { version = "2.0.4", features = ["full"] }
 
 [dev-dependencies]
 trybuild = "1.0.61"
-uefi = { version = "0.23.0", default-features = false }
+uefi = { version = "0.24.0", default-features = false }
diff --git a/uefi-services/Cargo.toml b/uefi-services/Cargo.toml
index 859245085..3ca266154 100644
--- a/uefi-services/Cargo.toml
+++ b/uefi-services/Cargo.toml
@@ -13,7 +13,7 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-uefi = { version = "0.23.0", features = ["global_allocator"] }
+uefi = { version = "0.24.0", features = ["global_allocator"] }
 log = { version = "0.4.5", default-features = false }
 cfg-if = "1.0.0"
 qemu-exit = { version = "3.0.1", optional = true }