fixup! Remove vendored guid_macros crate

Author: JohnAZoidberg

Cargo.lock

@@ -11,7 +11,7 @@
 use std::prelude::v1::*;
 
 use core::prelude::rust_2021::derive;
-use guid_create::GUID;
+use guid_create::Guid;
 #[cfg(not(feature = "uefi"))]
 use std::fs::File;
 #[cfg(not(feature = "uefi"))]
@@ -21,7 +21,7 @@ use std::io::prelude::*;
 #[repr(C)]
 pub struct EfiCapsuleHeader {
     /// A GUID that defines the contents of a capsule.
-    pub capsule_guid: GUID,
+    pub capsule_guid: Guid,
 
     /// The size of the capsule header. This may be larger than the size of
     /// the EFI_CAPSULE_HEADER since CapsuleGuid may imply
@@ -205,14 +205,14 @@ mod tests {
         let data = fs::read(capsule_path).unwrap();
         let cap = parse_capsule_header(&data).unwrap();
         let expected_header = EfiCapsuleHeader {
-            capsule_guid: esrt::WINUX_GUID,
+            capsule_guid: Guid::from(esrt::WINUX_GUID),
             header_size: 28,
             flags: 65536,
             capsule_image_size: 676898,
         };
         assert_eq!(cap, expected_header);
 
-        assert_eq!(cap.capsule_guid, esrt::WINUX_GUID);
+        assert_eq!(cap.capsule_guid, Guid::from(esrt::WINUX_GUID));
         let ux_header = parse_ux_header(&data);
         assert_eq!(
             ux_header,

framework_lib/src/capsule.rs

@@ -7,6 +7,7 @@ use alloc::format;
 use alloc::string::String;
 use alloc::string::ToString;
 use alloc::vec::Vec;
+use guid_create::{Guid, GUID};
 use log::Level;
 use num_traits::FromPrimitive;
 
@@ -995,7 +996,7 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
             println!("  Size:       {:>20} B", data.len());
             println!("  Size:       {:>20} KB", data.len() / 1024);
             if let Some(header) = analyze_capsule(&data) {
-                if header.capsule_guid == esrt::WINUX_GUID {
+                if header.capsule_guid == Guid::from(esrt::WINUX_GUID) {
                     let ux_header = capsule::parse_ux_header(&data);
                     if let Some(dump_path) = &args.dump {
                         // TODO: Better error handling, rather than just panicking
@@ -1397,7 +1398,7 @@ pub fn analyze_capsule(data: &[u8]) -> Option<capsule::EfiCapsuleHeader> {
     let header = capsule::parse_capsule_header(data)?;
     capsule::print_capsule_header(&header);
 
-    match header.capsule_guid {
+    match GUID::from(header.capsule_guid) {
         esrt::TGL_BIOS_GUID => {
             println!("  Type:         Framework TGL Insyde BIOS");
         }

framework_lib/src/commandline/mod.rs

@@ -15,7 +15,7 @@ use log::{debug, error, info, trace};
 use std::prelude::v1::*;
 
 use core::prelude::v1::derive;
-use guid_create::GUID;
+use guid_create::{Guid, GUID};
 
 #[cfg(target_os = "linux")]
 use std::fs;
@@ -179,8 +179,8 @@ pub enum FrameworkGuidKind {
     Unknown,
 }
 
-pub fn match_guid_kind(guid: &GUID) -> FrameworkGuidKind {
-    match *guid {
+pub fn match_guid_kind(guid: &Guid) -> FrameworkGuidKind {
+    match GUID::from(*guid) {
         TGL_BIOS_GUID => FrameworkGuidKind::TglBios,
         ADL_BIOS_GUID => FrameworkGuidKind::AdlBios,
         RPL_BIOS_GUID => FrameworkGuidKind::RplBios,
@@ -296,7 +296,7 @@ pub fn print_esrt(esrt: &Esrt) {
         println!("  GUID:                 {}", entry.fw_class);
         println!(
             "  GUID:                 {:?}",
-            match_guid_kind(&entry.fw_class)
+            match_guid_kind(&Guid::from(entry.fw_class))
         );
         println!(
             "  Type:                 {:?}",
@@ -487,7 +487,7 @@ pub fn get_esrt() -> Option<Esrt> {
     let mut buf: Vec<u8> = Vec::new();
     let mut table = EfiGetTableIoc {
         buf: std::ptr::null_mut(),
-        uuid: SYSTEM_RESOURCE_TABLE_GUID.to_bytes(),
+        uuid: SYSTEM_RESOURCE_TABLE_GUID_BYTES,
         buf_len: 0,
         table_len: 0,
     };
@@ -513,6 +513,9 @@ pub const SYSTEM_RESOURCE_TABLE_GUID: GUID = GUID::build_from_components(
     0x4f68,
     &[0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80],
 );
+pub const SYSTEM_RESOURCE_TABLE_GUID_BYTES: [u8; 16] = [
+    0xb1, 0x22, 0xa2, 0x63, 0x36, 0x61, 0x4f, 0x68, 0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80,
+];
 
 #[cfg(feature = "uefi")]
 pub fn get_esrt() -> Option<Esrt> {