Merge pull request #162 from rust-osdev/nightly-fix

Fix build on latest Rust nightly

Author: phil-opp

Cargo.lock

@@ -33,7 +33,7 @@ x86_64 = { version = "0.13.2", optional = true, default-features = false, featur
 usize_conversions = { version = "0.2.0", optional = true }
 bit_field = { version = "0.10.0", optional = true }
 log = { version = "0.4.8", optional = true }
-uefi = { version = "0.7.0", optional = true }
+uefi = { version = "0.9.0", optional = true }
 argh = { version = "0.1.3", optional = true }
 displaydoc = { version = "0.1.7", optional = true }
 conquer-once = { version = "0.2.1", optional = true, default-features = false }

Cargo.toml

@@ -1,5 +1,7 @@
 # Unreleased
 
+- Fix build on latest Rust nightly by updating to `uefi` v0.9.0 ([#162](https://github.com/rust-osdev/bootloader/pull/162))
+
 # 0.10.3 – 2021-05-05
 
 - Change register used in setting SS in stage_4 ([#156](https://github.com/rust-osdev/bootloader/pull/156))

Changelog.md

@@ -154,8 +154,8 @@ fn init_logger(st: &SystemTable<Boot>) -> (PhysAddr, FrameBufferInfo) {
         horizontal_resolution: mode_info.resolution().0,
         vertical_resolution: mode_info.resolution().1,
         pixel_format: match mode_info.pixel_format() {
-            PixelFormat::RGB => bootloader::boot_info::PixelFormat::BGR,
-            PixelFormat::BGR => bootloader::boot_info::PixelFormat::BGR,
+            PixelFormat::Rgb => bootloader::boot_info::PixelFormat::BGR,
+            PixelFormat::Bgr => bootloader::boot_info::PixelFormat::BGR,
             PixelFormat::Bitmask | PixelFormat::BltOnly => {
                 panic!("Bitmask and BltOnly framebuffers are not supported")
             }